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 686c9b50809d
"netfilter: x_tables: Use par->net instead of computing
from the passed net devices".

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

diff --git a/include/uapi/linux/netfilter/xt_socket.h b/include/uapi/linux/netfilter/xt_socket.h
index 15b4c1cf99bb56c65e77a0e4ae82b80c10fa3683..7f00df6cd8975273d0554bff021703a57542e52b 100644 (file)
--- a/include/uapi/linux/netfilter/xt_socket.h
+++ b/include/uapi/linux/netfilter/xt_socket.h
@@ -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 */

diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c
index 90b2c6aac7d85b0af0315a24cc3f036a9432acf8..62ddd6cd1ee8ae0a0be6af1160f208590ec9e3ce 100644 (file)
--- a/net/netfilter/xt_qtaguid.c
+++ b/net/netfilter/xt_qtaguid.c
@@ -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;