From patchwork Thu Feb 2 11:21:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: sjur.brandeland@stericsson.com X-Patchwork-Id: 139121 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 00FF2104785 for ; Thu, 2 Feb 2012 22:21:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755773Ab2BBLVL (ORCPT ); Thu, 2 Feb 2012 06:21:11 -0500 Received: from mail-lpp01m020-f174.google.com ([209.85.217.174]:58974 "EHLO mail-lpp01m020-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755572Ab2BBLVJ (ORCPT ); Thu, 2 Feb 2012 06:21:09 -0500 Received: by lbom4 with SMTP id m4so338139lbo.19 for ; Thu, 02 Feb 2012 03:21:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=yvYXDsIDyKrv6btZGKI8zr/VRGcQoD4J7wMxh/mnZVo=; b=XlRzLXxOgwjfz5Ho8tj2y3LSM/KOKn9W8f4VEHZZZc6JT1apxI8LZNR5EUF+u71WPB wFgFYMLYLr8IBmLfZyZTfm6dRIqBgPWUFmlSegSG6/GDqTOKa5HY2QDxrsGB8mz7qxr3 y+toxTbse6owzEmo9ruGuXsyLlC2b5TI/6keI= Received: by 10.112.38.227 with SMTP id j3mr600126lbk.88.1328181667730; Thu, 02 Feb 2012 03:21:07 -0800 (PST) Received: from localhost.localdomain ([212.4.57.94]) by mx.google.com with ESMTPS id xz3sm1777448lab.7.2012.02.02.03.21.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Feb 2012 03:21:07 -0800 (PST) From: =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= To: netdev@vger.kernel.org, davem@davemloft.net Cc: sjurbren@gmail.com, Dmitry Tarnyagin , =?UTF-8?q?Sjur=20Br=C3=A6ndeland?= Subject: [PATCH net 2/2] caif: Bugfix double kfree_skb upon xmit failure Date: Thu, 2 Feb 2012 12:21:03 +0100 Message-Id: <1328181663-13853-2-git-send-email-sjur.brandeland@stericsson.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1328181663-13853-1-git-send-email-sjur.brandeland@stericsson.com> References: <1328181663-13853-1-git-send-email-sjur.brandeland@stericsson.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dmitry Tarnyagin SKB is freed twice upon send error. The Network stack consumes SKB even when it returns error code. Signed-off-by: Sjur Brændeland --- net/caif/caif_socket.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index a986280..a97d97a 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -539,8 +539,10 @@ static int transmit_skb(struct sk_buff *skb, struct caifsock *cf_sk, pkt = cfpkt_fromnative(CAIF_DIR_OUT, skb); memset(skb->cb, 0, sizeof(struct caif_payload_info)); - if (cf_sk->layer.dn == NULL) + if (cf_sk->layer.dn == NULL) { + kfree_skb(skb); return -EINVAL; + } return cf_sk->layer.dn->transmit(cf_sk->layer.dn, pkt); } @@ -683,10 +685,10 @@ static int caif_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, } err = transmit_skb(skb, cf_sk, msg->msg_flags&MSG_DONTWAIT, timeo); - if (err < 0) { - kfree_skb(skb); + if (err < 0) + /* skb is already freed */ goto pipe_err; - } + sent += size; }