Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8827d90e authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

smack: use skb_to_full_sk() helper 



This module wants to access sk->sk_security, which is not
available for request sockets.

Fixes: ca6fb065 ("tcp: attach SYNACK messages to request sockets instead of listener")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54abc686

security/smack/smack_netfilter.c

+7 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/netfilter_ipv4.h>

#include <linux/netfilter_ipv6.h>

#include <linux/netdevice.h>

#include <net/inet_sock.h>

#include "smack.h"



#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@@ -25,11 +26,12 @@ static unsigned int smack_ipv6_output(void *priv, 
					struct sk_buff *skb,

					const struct nf_hook_state *state)

{

	struct sock *sk = skb_to_full_sk(skb);

	struct socket_smack *ssp;

	struct smack_known *skp;



	if (skb && skb->sk && skb->sk->sk_security) {

		ssp = skb->sk->sk_security;

	if (sk && sk->sk_security) {

		ssp = sk->sk_security;

		skp = ssp->smk_out;

		skb->secmark = skp->smk_secid;

	}
@@ -42,11 +44,12 @@ static unsigned int smack_ipv4_output(void *priv, 
					struct sk_buff *skb,

					const struct nf_hook_state *state)

{

	struct sock *sk = skb_to_full_sk(skb);

	struct socket_smack *ssp;

	struct smack_known *skp;



	if (skb && skb->sk && skb->sk->sk_security) {

		ssp = skb->sk->sk_security;

	if (sk && sk->sk_security) {

		ssp = sk->sk_security;

		skp = ssp->smk_out;

		skb->secmark = skp->smk_secid;

	}