From patchwork Sun Oct 18 08:05:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Gottwald X-Patchwork-Id: 1383816 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=posteo.net Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=posteo.net header.i=@posteo.net header.a=rsa-sha256 header.s=2017 header.b=Uy+eosI/; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CDXgH0x2Bz9sTK for ; Sun, 18 Oct 2020 19:12:27 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726060AbgJRILf (ORCPT ); Sun, 18 Oct 2020 04:11:35 -0400 Received: from mout02.posteo.de ([185.67.36.66]:39129 "EHLO mout02.posteo.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725306AbgJRILe (ORCPT ); Sun, 18 Oct 2020 04:11:34 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 45E7B240100 for ; Sun, 18 Oct 2020 10:05:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1603008352; bh=vZxZj7oj7QUNuviH5VLiwbWy1JcPQBn1lLjXjgnPOCM=; h=From:To:Cc:Subject:Date:From; b=Uy+eosI/tVN1LiUOutIuliVmwqS8rcVadllIb8SjX/C7h6r+TwKxFpUIhL9VnbjRF +Z0qD9iB6SkeYxd6kuYGPX1g7V2siOe0sc7w/BlZuFKBiLB6THS2FS/+L1rDPJ0b4h dXJmrVy/GoIp/yQMyBEh/DRZhI6AesSBdZUHgYtXc9fSTfEFGiyP4Uax2qxye2DtGc emMT81QLbjufgkh/hvFN0a0rZBWcrQSdviyMMwXssIcHVOb1NV3p5xE0upqZX+aV5Y K11iXYr2gRQD4N/ojet2ybgS29DsyEBRQgg/wMhp6m3uURwj8+RXWhBiKGhi+tpBhr 5aumUoWDrQoxw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4CDXWd4W38z6tm9; Sun, 18 Oct 2020 10:05:49 +0200 (CEST) From: Stefan Gottwald To: marcel@holtmann.org Cc: gregkh@linuxfoundation.org, gottwald@igel.com, gotti79@posteo.net, Johan Hedberg , "David S. Miller" , Jakub Kicinski , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Bluetooth: A2MP: Do not set rsp.id to zero Date: Sun, 18 Oct 2020 10:05:32 +0200 Message-Id: <1603008332-8402-1-git-send-email-gotti79@posteo.net> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Due to security reasons the rsp struct is not zerod out in one case this will also zero out the former set rsp.id which seems to be wrong. Signed-off-by: Stefan Gottwald --- net/bluetooth/a2mp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/bluetooth/a2mp.c b/net/bluetooth/a2mp.c index da7fd7c..7a1e0b7 100644 --- a/net/bluetooth/a2mp.c +++ b/net/bluetooth/a2mp.c @@ -381,10 +381,11 @@ static int a2mp_getampassoc_req(struct amp_mgr *mgr, struct sk_buff *skb, hdev = hci_dev_get(req->id); if (!hdev || hdev->amp_type == AMP_TYPE_BREDR || tmp) { struct a2mp_amp_assoc_rsp rsp; - rsp.id = req->id; memset(&rsp, 0, sizeof(rsp)); + rsp.id = req->id; + if (tmp) { rsp.status = A2MP_STATUS_COLLISION_OCCURED; amp_mgr_put(tmp);