netfilter: Fix error in ipq_enqueue_packet
Subsystems (2)
PATCH 1/1 netfilter: Fix error in ipq_enqueue_packet
ipq_enqueue_packet sets status=-EINVAL and calls ipq_build_packet_message(entry, &status). This can set status=0 while returning an skb. The next line:
if (!peer_pid) goto err_out_free_nskb;
which wrongly returns success.
Signed-off-by Krishna Kumar <[email protected]>
--- net/ipv4/netfilter/ip_queue.c | 6 ++++-- net/ipv6/netfilter/ip6_queue.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
net/ipv4/netfilter/ip_queue.c +4 -2
@@ -227,7 +227,7 @@ nlmsg_failure:static int ipq_enqueue_packet (struct nf_queue_entry *entry,unsigned int queuenum) { -int status = -EINVAL ; +int status;struct sk_buff *nskb;if (copy_mode ==IPQ_COPY_NONE )
@@ -239,8 +239,10 @@ ipq_enqueue_packet(struct nf_queue_entryspin_lock_bh (&queue_lock); -if (!peer_pid) +if (!peer_pid) { + status = -EINVAL ; goto err_out_free_nskb; + }if (queue_total >= queue_maxlen) { queue_dropped++;
net/ipv6/netfilter/ip6_queue.c +4 -2
@@ -227,7 +227,7 @@ nlmsg_failure:static int ipq_enqueue_packet (struct nf_queue_entry *entry,unsigned int queuenum) { -int status = -EINVAL ; +int status;struct sk_buff *nskb;if (copy_mode ==IPQ_COPY_NONE )
@@ -239,8 +239,10 @@ ipq_enqueue_packet(struct nf_queue_entryspin_lock_bh (&queue_lock); -if (!peer_pid) +if (!peer_pid) { + status = -EINVAL ; goto err_out_free_nskb; + }if (queue_total >= queue_maxlen) { queue_dropped++;