lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netfilter: remove unneccessary checks from netlink notifiers

Browse Source 
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>
This commit is contained in:
Patrick McHardy
2009-11-06 17:04:00 +01:00
parent 76ac894080
commit dee5817e88
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/netfilter/ip_queue.c
View File

@@ -497,8 +497,7 @@ ipq_rcv_nl_event(struct notifier_block *this,
{ {
struct netlink_notify *n = ptr; struct netlink_notify *n = ptr;
if (event == NETLINK_URELEASE && if (event == NETLINK_URELEASE && n->protocol == NETLINK_FIREWALL) {
n->protocol == NETLINK_FIREWALL && n->pid) {
write_lock_bh(&queue_lock); write_lock_bh(&queue_lock);
if ((n->net == &init_net) && (n->pid == peer_pid)) if ((n->net == &init_net) && (n->pid == peer_pid))
__ipq_reset(); __ipq_reset();

3
net/ipv6/netfilter/ip6_queue.c
View File

@@ -499,8 +499,7 @@ ipq_rcv_nl_event(struct notifier_block *this,
{ {
struct netlink_notify *n = ptr; struct netlink_notify *n = ptr;
if (event == NETLINK_URELEASE && if (event == NETLINK_URELEASE && n->protocol == NETLINK_IP6_FW) {
n->protocol == NETLINK_IP6_FW && n->pid) {
write_lock_bh(&queue_lock); write_lock_bh(&queue_lock);
if ((n->net == &init_net) && (n->pid == peer_pid)) if ((n->net == &init_net) && (n->pid == peer_pid))
__ipq_reset(); __ipq_reset();

3
net/netfilter/nfnetlink_log.c
View File

@@ -666,8 +666,7 @@ nfulnl_rcv_nl_event(struct notifier_block *this,
{ {
struct netlink_notify *n = ptr; struct netlink_notify *n = ptr;
if (event == NETLINK_URELEASE && if (event == NETLINK_URELEASE && n->protocol == NETLINK_NETFILTER) {
n->protocol == NETLINK_NETFILTER && n->pid) {
int i; int i;
/* destroy all instances for this pid */ /* destroy all instances for this pid */

3
net/netfilter/nfnetlink_queue.c
View File

@@ -574,8 +574,7 @@ nfqnl_rcv_nl_event(struct notifier_block *this,
{ {
struct netlink_notify *n = ptr; struct netlink_notify *n = ptr;
if (event == NETLINK_URELEASE && if (event == NETLINK_URELEASE && n->protocol == NETLINK_NETFILTER) {
n->protocol == NETLINK_NETFILTER && n->pid) {
int i; int i;
/* destroy all instances for this pid */ /* destroy all instances for this pid */