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

netfilter: {ip,ip6,nfnetlink}_queue: misc cleanups

Browse Source 
- No need to perform data_len = 0 in the switch command, since data_len
  is initialized to 0 in the beginning of the ipq_build_packet_message()
  method.

- {ip,ip6}_queue: We can reach nlmsg_failure only from one place; skb is
  sure to be NULL when getting there; since skb is NULL, there is no need
  to check this fact and call kfree_skb().

Signed-off-by: Rami Rosen <ramirose@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rami Rosen
2008-06-09 16:00:45 -07:00
committed by David S. Miller
parent 7bcd978e8c
commit e64bda89b8
3 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,7 +156,6 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp)
case IPQ_COPY_META: case IPQ_COPY_META:
case IPQ_COPY_NONE: case IPQ_COPY_NONE:
size = NLMSG_SPACE(sizeof(*pmsg)); size = NLMSG_SPACE(sizeof(*pmsg));
data_len = 0;
break; break;
case IPQ_COPY_PACKET: case IPQ_COPY_PACKET:
@ -224,8 +223,6 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp)
return skb; return skb;
nlmsg_failure: nlmsg_failure:
if (skb)
kfree_skb(skb);
*errp = -EINVAL; *errp = -EINVAL;
printk(KERN_ERR "ip_queue: error creating packet message\n"); printk(KERN_ERR "ip_queue: error creating packet message\n");
return NULL; return NULL;

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

@ -159,7 +159,6 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp)
case IPQ_COPY_META: case IPQ_COPY_META:
case IPQ_COPY_NONE: case IPQ_COPY_NONE:
size = NLMSG_SPACE(sizeof(*pmsg)); size = NLMSG_SPACE(sizeof(*pmsg));
data_len = 0;
break; break;
case IPQ_COPY_PACKET: case IPQ_COPY_PACKET:
@ -226,8 +225,6 @@ ipq_build_packet_message(struct nf_queue_entry *entry, int *errp)
return skb; return skb;
nlmsg_failure: nlmsg_failure:
if (skb)
kfree_skb(skb);
*errp = -EINVAL; *errp = -EINVAL;
printk(KERN_ERR "ip6_queue: error creating packet message\n"); printk(KERN_ERR "ip6_queue: error creating packet message\n");
return NULL; return NULL;

1
net/netfilter/nfnetlink_queue.c
View File

@ -243,7 +243,6 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,
switch ((enum nfqnl_config_mode)queue->copy_mode) { switch ((enum nfqnl_config_mode)queue->copy_mode) {
case NFQNL_COPY_META: case NFQNL_COPY_META:
case NFQNL_COPY_NONE: case NFQNL_COPY_NONE:
data_len = 0;
break; break;
case NFQNL_COPY_PACKET: case NFQNL_COPY_PACKET: