iMX/i2som-imx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
This commit is contained in:
Amit Pundir
2015-11-20 14:45:40 +05:30
committed by Dmitry Shmidt
parent 6e2b405681
commit 7de1bb86dc
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/uapi/linux/netfilter/xt_socket.h
View File

@ -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,
const struct net_device *indev);
struct sock *xt_socket_lookup_slow_v6(const struct sk_buff *skb,
const struct net_device *indev);
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 */

4
net/netfilter/xt_qtaguid.c
View File

@ -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;