summaryrefslogtreecommitdiffstats
path: root/drivers/connector
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2011-05-17 15:25:38 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-06-07 12:02:00 -0700
commit663dd6dcaf7e95526e469e91f41972a9c0cca30c (patch)
tree819a0fb54725a53e59c4a855f92a4425946f0fcd /drivers/connector
parentea2c00095c022846dd8dfd211de05154d3e4e1b8 (diff)
downloadop-kernel-dev-663dd6dcaf7e95526e469e91f41972a9c0cca30c.zip
op-kernel-dev-663dd6dcaf7e95526e469e91f41972a9c0cca30c.tar.gz
Connector: Correctly set the error code in case of success when dispatching receive callbacks
The recent changes to the connector code introduced this bug where even when a callback was invoked, we would return an error resulting in double freeing of the skb. This patch fixes this bug. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Cc: stable <stable@kernel.org> [.39] Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/connector')
-rw-r--r--drivers/connector/connector.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 219d88a..dde6a0f 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -139,6 +139,7 @@ static int cn_call_callback(struct sk_buff *skb)
spin_unlock_bh(&dev->cbdev->queue_lock);
if (cbq != NULL) {
+ err = 0;
cbq->callback(msg, nsp);
kfree_skb(skb);
cn_queue_release_callback(cbq);
OpenPOWER on IntegriCloud