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

Commit 2879b6ec authored by Amit Pundir's avatar Amit Pundir Committed by Dmitry Shmidt
Browse files

ANDROID: xt_qtaguid: use sock_gen_put() instead of xt_socket_put_sk() 



Removing obsolete xt_socket_put_sk() and using sock_gen_put() instead.
xt_socket_put_sk() was reintroduced for xt_qtaguid in one of the patches,
but it turned out sock_gen_put() supersedes xt_socket_put_sk(). So we
don't need xt_socket_put_sk() any more.

This patch is based on commit 1a8bf6ee (netfilter: xt_socket: use sock_gen_put())

Change-Id: I976d5f7f7eded0f3cc91b596acfeb35e4c2057e5
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
(cherry picked from commit 551780fc28cb7480dbc4f585ef80ca02c2922ec1)
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent e8101fd0

include/uapi/linux/netfilter/xt_socket.h

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

			   | XT_SOCKET_RESTORESKMARK)



void xt_socket_put_sk(struct sock *sk);

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,

net/netfilter/xt_qtaguid.c

+2 −2
Original line number Diff line number Diff line
@@ -1605,7 +1605,7 @@ static struct sock *qtaguid_find_sk(const struct sk_buff *skb, 
		 * "struct inet_timewait_sock" which is missing fields.

		 */

		if (sk->sk_state  == TCP_TIME_WAIT) {

			xt_socket_put_sk(sk);

			sock_gen_put(sk);

			sk = NULL;

		}

	}
@@ -1803,7 +1803,7 @@ static bool qtaguid_mt(const struct sk_buff *skb, struct xt_action_param *par) 


put_sock_ret_res:

	if (got_sock)

		xt_socket_put_sk(sk);

		sock_gen_put(sk);

	if (set_sk_callback_lock)

		read_unlock_bh(&sk->sk_callback_lock);

ret_res:

net/netfilter/xt_socket.c

+0 −10
Original line number Diff line number Diff line
@@ -35,16 +35,6 @@ 
#include <net/netfilter/nf_conntrack.h>

#endif



void

xt_socket_put_sk(struct sock *sk)

{

	if (sk->sk_state == TCP_TIME_WAIT)

		inet_twsk_put(inet_twsk(sk));

	else

		sock_put(sk);

}

EXPORT_SYMBOL(xt_socket_put_sk);



static int

extract_icmp4_fields(const struct sk_buff *skb,

		    u8 *protocol,