From patchwork Thu Mar 8 04:56:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130933 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp6026963lja; Wed, 7 Mar 2018 20:56:15 -0800 (PST) X-Google-Smtp-Source: AG47ELtR66oXI6Crl2Fpb2HXHe0lNLF77f/BEpdFuHgcjyU4CNd0RuUmp78JLvmXBiD3avwyFOWR X-Received: by 2002:a17:902:66e6:: with SMTP id e93-v6mr22848873plk.312.1520484975235; Wed, 07 Mar 2018 20:56:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520484975; cv=none; d=google.com; s=arc-20160816; b=rH9Btfk3K2Oa5vEGHNjxSOppnpGwNPjiApoF3oSd2aWGlRrhaf0my0ej8amPZLAsoo NgCBetwwA5pdp6SCU6l8YqAy7BIzn4BQaAnul9qFv/wwezKa1Hncf/wvKJAe3ptc/1E3 cQbTQFsrkd8hQT7oaNAKip94g5VpAA0CUu0th8Nv6mEqo0FePwJmX1RKXt2ajMpQcPpH lUJx7ITA8jW8+KYkbSz5myxUs29opC1DOb8l645PVF3vSQYi2r3F6sYmImVrE6V58uWa cvk2dbNJ/ooZMOkAB1XoYJ/XCIrmlsnaZ3EQnhoLIy+cX9Cg16HIbm+XpOAnwinO3Fln SnQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=/1GXPH5nmS0CMQNJxf7FGYSpOEHTE3q8ZMHXbucL+3w=; b=mcOxKoHzKonsb0AZqpWpA1l+jYFBIrMqTHA/YM62z2BKtm2Yh+0XNvcswNVWpfjevv ySPybhkm0n3f6BQLHWKvXzFARP7VVkplzx9Wvj8ouRPfUp4WpSVeyTOhKsK/bBaWH1XR 7d3R4VZ+Ty6tNzlsHnLs/6gkMaC90RmDe+R70WQ9QjFV2c7v4ye4PoL5vE32cEemUX+u N9PNsveldRt4DsVRzw1xvp8PmGx1RXWjtMbZx62zDSq8t7rkMq6uJPpfb6FJmk6yfrGR 1ZoBkPuVFmruM3jgVpOJ4r2wOsoAHSudLJ3zyaoFsPJQAwdDs7iTHGCSXV9xh2vbstJ5 oBJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=XURpB+Qg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1-v6si14214196pla.496.2018.03.07.20.56.14; Wed, 07 Mar 2018 20:56:15 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=XURpB+Qg; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755081AbeCHE4J (ORCPT + 28 others); Wed, 7 Mar 2018 23:56:09 -0500 Received: from mail-by2nam03on0095.outbound.protection.outlook.com ([104.47.42.95]:43489 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754997AbeCHE4F (ORCPT ); Wed, 7 Mar 2018 23:56:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=/1GXPH5nmS0CMQNJxf7FGYSpOEHTE3q8ZMHXbucL+3w=; b=XURpB+QgdBQtPZ3Ip8xnRnC4M4Jw95YJsSV1BWBrBpUlXq5T46Pj+6kpZOj+SHpQEkpQHEoeEBwJbqdgM+po4q1QqwyjHkzBI2JnMYbGsT6Akt8XUzFB5RWF1REOr23rX1k7o1YQn25+CMjnxRQWp5iRpfHJQou4y4clokZxpSA= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0902.namprd21.prod.outlook.com (52.132.132.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.588.3; Thu, 8 Mar 2018 04:56:02 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0588.008; Thu, 8 Mar 2018 04:56:02 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Loic Poulain , Marcel Holtmann , Sasha Levin Subject: [PATCH AUTOSEL for 4.15 04/78] Bluetooth: btqcomsmd: Fix skb double free corruption Thread-Topic: [PATCH AUTOSEL for 4.15 04/78] Bluetooth: btqcomsmd: Fix skb double free corruption Thread-Index: AQHTtpnBg/Lz5y61L0awhM+uj730kQ== Date: Thu, 8 Mar 2018 04:56:02 +0000 Message-ID: <20180308045525.7662-4-alexander.levin@microsoft.com> References: <20180308045525.7662-1-alexander.levin@microsoft.com> In-Reply-To: <20180308045525.7662-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0902; 20:D+Hn7hRlMB1LS8F70bE7x2i/GaZJ0xNs+8v7fFgCtaKEa/wb70LBfodEA5qJTjpRR+3g7ayTmShHN+NgSYst9RkrEqln/D2xR+JLMncTTgSfHmzV2Bb9e0Zq/rQ1OGrE2hieP/KN/b8gynmrMrEsxeYq8jSp174OV1kifA/0DA0= x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 212ed212-170c-4c68-4f44-08d584b0e46a x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0902; x-ms-traffictypediagnostic: DM5PR2101MB0902: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3002001)(3231220)(944501244)(52105095)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:DM5PR2101MB0902; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0902; x-forefront-prvs: 060503E79B x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(39860400002)(39380400002)(376002)(366004)(396003)(189003)(199004)(8936002)(81156014)(81166006)(7736002)(5250100002)(8676002)(99286004)(26005)(107886003)(186003)(2950100002)(106356001)(10090500001)(575784001)(305945005)(66066001)(97736004)(2501003)(86362001)(3846002)(3660700001)(72206003)(6436002)(1076002)(6486002)(5660300001)(54906003)(110136005)(68736007)(53936002)(14454004)(36756003)(25786009)(478600001)(10290500003)(6506007)(59450400001)(2900100001)(102836004)(76176011)(6512007)(22452003)(6116002)(316002)(4326008)(105586002)(86612001)(2906002)(3280700002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0902; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: CsOHPNZbDKzdLZckCtPfImBGPUejEiUNS63PqpB7wnk8Wh+KHmYFC/tYUvjFRQQkjhKOKPDiwueOj/E5SWN3TBVZduHRABxGwUgLJG/db/kdaTcz5BAbkyd3YvtIz0I0s5pgWAz/AEvBdZANhiQ8fW/R4vohbtK5Y0nyOS+OkQ75GeE9BnVbcyNkKvTkNFU9UZw1jXlZtp3UwxPClGTSv9H7/TGm3NitTjetsQfhxWvF9jwF0ptt410y6ofuZ98ap5PBrgQ3yC5IeuJMZz0E4URh9ew/pmpYEFL4KVd6B/Q59q5OoLonzGzg9gc7CntIctYnc4NWD3vBI1KLVvhHqA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 212ed212-170c-4c68-4f44-08d584b0e46a X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2018 04:56:02.2725 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0902 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Loic Poulain [ Upstream commit 67b8fbead4685b36d290a0ef91c6ddffc4920ec9 ] In case of hci send frame failure, skb is still owned by the caller (hci_core) and then should not be freed. This fixes crash on dragonboard-410c when sending SCO packet. skb is freed by both btqcomsmd and hci_core. Fixes: 1511cc750c3d ("Bluetooth: Introduce Qualcomm WCNSS SMD based HCI driver") Signed-off-by: Loic Poulain Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- drivers/bluetooth/btqcomsmd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.14.1 diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c index 663bed63b871..2c9a5fc9137d 100644 --- a/drivers/bluetooth/btqcomsmd.c +++ b/drivers/bluetooth/btqcomsmd.c @@ -88,7 +88,8 @@ static int btqcomsmd_send(struct hci_dev *hdev, struct sk_buff *skb) break; } - kfree_skb(skb); + if (!ret) + kfree_skb(skb); return ret; }