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

Commit 5b10242b authored by Amit Pundir's avatar Amit Pundir
Browse files

ANDROID: xt_qtaguid: Fix socket lookup 



Upstream commit 8db4c5be ("netfilter: move socket lookup
infrastructure to nf_socket_ipv{4,6}.c")] moved socket lookup
to nf_socket_ipv{4,6}.c, hence use nf_sk_lookup_slow_v[4|6]()
instead of obsolete xt_socket_lookup_slow_v[4|6]().

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

include/uapi/linux/netfilter/xt_socket.h

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

			   | XT_SOCKET_RESTORESKMARK)



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(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
@@ -1585,10 +1585,10 @@ static struct sock *qtaguid_find_sk(const struct sk_buff *skb, 


	switch (par->family) {

	case NFPROTO_IPV6:

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

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

		break;

	case NFPROTO_IPV4:

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

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

		break;

	default:

		return NULL;