2007-10-30 23:18:29

by Michal Januszewski

Subject: [PATCH] Fix a spurious kfree_skb() call

Remove a spurious call to kfree_skb() in the connector rx_skb handler.

This fixes a regression introduced by the '[NET]: make netlink user ->
kernel interface synchronious' patch (cd40b7d3983c708aabe3d3008ec64ffce56d33b0)

Signed-off-by: Michal Januszewski <[email protected]>
---
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 0e328d3..6883fcb 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -218,7 +218,7 @@ static void cn_rx_skb(struct sk_buff *__skb)
skb->len < nlh->nlmsg_len ||
nlh->nlmsg_len > CONNECTOR_MAX_MSG_SIZE) {
kfree_skb(skb);
- goto out;
+ return;
}

len = NLMSG_ALIGN(nlh->nlmsg_len);
@@ -229,9 +229,6 @@ static void cn_rx_skb(struct sk_buff *__skb)
if (err < 0)
kfree_skb(skb);
}
-
-out:
- kfree_skb(__skb);
}

/*

2007-10-31 03:42:21

by David Miller

Subject: Re: [PATCH] Fix a spurious kfree_skb() call

From: Michal Januszewski <[email protected]>
Date: Wed, 31 Oct 2007 00:10:52 +0100

> Remove a spurious call to kfree_skb() in the connector rx_skb handler.
>
> This fixes a regression introduced by the '[NET]: make netlink user ->
> kernel interface synchronious' patch (cd40b7d3983c708aabe3d3008ec64ffce56d33b0)
>
> Signed-off-by: Michal Januszewski <[email protected]>

Applied, thanks!