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

Commit dee5817e authored Nov 06, 2009 by Patrick McHardy

netfilter: remove unneccessary checks from netlink notifiers



The NETLINK_URELEASE notifier is only invoked for bound sockets, so
there is no need to check ->pid again.

Signed-off-by: Patrick McHardy <kaber@trash.net>

parent 76ac8940

net/ipv4/netfilter/ip_queue.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -497,8 +497,7 @@ ipq_rcv_nl_event(struct notifier_block *this,
		{
		struct netlink_notify *n = ptr;

		if (event == NETLINK_URELEASE &&
		n->protocol == NETLINK_FIREWALL && n->pid) {
		if (event == NETLINK_URELEASE && n->protocol == NETLINK_FIREWALL) {
		write_lock_bh(&queue_lock);
		if ((n->net == &init_net) && (n->pid == peer_pid))
		__ipq_reset();

net/ipv6/netfilter/ip6_queue.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -499,8 +499,7 @@ ipq_rcv_nl_event(struct notifier_block *this,
		{
		struct netlink_notify *n = ptr;

		if (event == NETLINK_URELEASE &&
		n->protocol == NETLINK_IP6_FW && n->pid) {
		if (event == NETLINK_URELEASE && n->protocol == NETLINK_IP6_FW) {
		write_lock_bh(&queue_lock);
		if ((n->net == &init_net) && (n->pid == peer_pid))
		__ipq_reset();

net/netfilter/nfnetlink_log.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -666,8 +666,7 @@ nfulnl_rcv_nl_event(struct notifier_block *this,
		{
		struct netlink_notify *n = ptr;

		if (event == NETLINK_URELEASE &&
		n->protocol == NETLINK_NETFILTER && n->pid) {
		if (event == NETLINK_URELEASE && n->protocol == NETLINK_NETFILTER) {
		int i;

		/* destroy all instances for this pid */

net/netfilter/nfnetlink_queue.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -574,8 +574,7 @@ nfqnl_rcv_nl_event(struct notifier_block *this,
		{
		struct netlink_notify *n = ptr;

		if (event == NETLINK_URELEASE &&
		n->protocol == NETLINK_NETFILTER && n->pid) {
		if (event == NETLINK_URELEASE && n->protocol == NETLINK_NETFILTER) {
		int i;

		/* destroy all instances for this pid */