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

Commit 6e2b4056 authored by Amit Pundir's avatar Amit Pundir Committed by Dmitry Shmidt
Browse files

ANDROID: netfilter: xt_qtaguid: xt_socket: build fixes 



Add missing header <linux/miscdevice.h> and use
xt_socket_lookup_slow_v* instead of xt_socket_get*_sk
in xt_qtaguid.c.

Fix xt_socket_lookup_slow_v* functions in xt_socket.c
and declare them in xt_socket.h

Change-Id: I55819b2d4ffa82a2be20995c87d28fb5cc77b5ba
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 20e85a20

include/uapi/linux/netfilter/xt_socket.h

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

			   | XT_SOCKET_RESTORESKMARK)



struct sock *xt_socket_get4_sk(const struct sk_buff *skb,

			       struct xt_action_param *par);

struct sock *xt_socket_get6_sk(const struct sk_buff *skb,

			       struct xt_action_param *par);

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



#endif /* _XT_SOCKET_H */

net/netfilter/xt_qtaguid.c

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

#include <linux/inetdevice.h>

#include <linux/module.h>

#include <linux/miscdevice.h>

#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/xt_qtaguid.h>

#include <linux/ratelimit.h>
@@ -1588,10 +1589,10 @@ static struct sock *qtaguid_find_sk(const struct sk_buff *skb, 


	switch (par->family) {

	case NFPROTO_IPV6:

		sk = xt_socket_get6_sk(skb, par);

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

		break;

	case NFPROTO_IPV4:

		sk = xt_socket_get4_sk(skb, par);

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

		break;

	default:

		return NULL;