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

Commit 7de1bb86 authored by Amit Pundir's avatar Amit Pundir Committed by Dmitry Shmidt
Browse files

ANDROID: netfilter: xt_qtaguid/socket: build fixes for 4.4 



Update xt_socket_lookup_slow_v* usage in aosp patches, to
align with changes from mainline commit 686c9b50
"netfilter: x_tables: Use par->net instead of computing
from the passed net devices".

Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parent 6e2b4056

include/uapi/linux/netfilter/xt_socket.h

+6 −4
Original line number Diff line number Diff line
@@ -26,9 +26,11 @@ struct xt_socket_mtinfo3 { 
			   | XT_SOCKET_NOWILDCARD \

			   | XT_SOCKET_RESTORESKMARK)



struct sock *xt_socket_lookup_slow_v4(const struct sk_buff *skb,

struct sock *xt_socket_lookup_slow_v4(struct net *net,

				      const struct sk_buff *skb,

				      const struct net_device *indev);

struct sock *xt_socket_lookup_slow_v6(const struct sk_buff *skb,

struct sock *xt_socket_lookup_slow_v6(struct net *net,

				      const struct sk_buff *skb,

				      const struct net_device *indev);



#endif /* _XT_SOCKET_H */

net/netfilter/xt_qtaguid.c

+2 −2
Original line number Diff line number Diff line
@@ -1589,10 +1589,10 @@ static struct sock *qtaguid_find_sk(const struct sk_buff *skb, 


	switch (par->family) {

	case NFPROTO_IPV6:

		sk = xt_socket_lookup_slow_v6(skb, par->in);

		sk = xt_socket_lookup_slow_v6(dev_net(skb->dev), skb, par->in);

		break;

	case NFPROTO_IPV4:

		sk = xt_socket_lookup_slow_v4(skb, par->in);

		sk = xt_socket_lookup_slow_v4(dev_net(skb->dev), skb, par->in);

		break;

	default:

		return NULL;