From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3F371AC242; Thu, 6 Jun 2024 14:15:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683307; cv=none; b=ii40zGfCslGT2b64b8vxoZ3Aa4U0bfQE+wEC7rg5ol/uS6wNkLr2HYx6INYlEVMXOqXkkjFpL9pp5gZf+6LN3ahHliib2o91p6tvf7qEEUTGDwqqAEEuyYHRL1H5zDCweRHgJ1rD4gZj5y33jxhdxEylk7VysCvJgdzrhu4r9lw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683307; c=relaxed/simple; bh=vlGrCpPvbz5Zx+vqw/v7cUl+Z6abbVLj0MwTdwxs0yY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ymi/auacdoR9KLNKrnLfXWvn9GkDjTm1PjxkpnOAJiXnJ8ENMMqNRCiILrl2elT5MOZW086k9m76jwoOOk+fIJ51U+oPxRjoriJNAdJ37bMcizrJqWMPI6FkuCj1fo/oj/BMpr2CQrVTBjlk2il7QN/S2OpYWlcAK0+1ZJFgcps= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y0XuSnOG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Y0XuSnOG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80CEAC2BD10; Thu, 6 Jun 2024 14:15:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683307; bh=vlGrCpPvbz5Zx+vqw/v7cUl+Z6abbVLj0MwTdwxs0yY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y0XuSnOGkFDHN9hYpc2k+m4Jj9Ccnsv/KYB/O0roo8v2LKZmYKX/q6pHSOy7uSAMe 6Y0JDmFctZqqqafDQ1XKoyqNTn/KiG20faRH70u09IqJyeorBZL6M2LhQgLcX3+0QQ 6s+YH2dklOFkcJWlyRhWu58+I/HIoNK3X0gtuOME= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Johan Hovold , Luiz Augusto von Dentz , Sasha Levin Subject: [PATCH 6.1 188/473] Bluetooth: qca: Fix error code in qca_read_fw_build_info() Date: Thu, 6 Jun 2024 16:01:57 +0200 Message-ID: <20240606131706.146119909@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131659.786180261@linuxfoundation.org> References: <20240606131659.786180261@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter [ Upstream commit a189f0ee6685457528db7a36ded3085e5d13ddc3 ] Return -ENOMEM on allocation failure. Don't return success. Fixes: cda0d6a198e2 ("Bluetooth: qca: fix info leak when fetching fw build id") Signed-off-by: Dan Carpenter Reviewed-by: Johan Hovold Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Sasha Levin --- drivers/bluetooth/btqca.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c index a0fadde993d70..2dda94a0875a6 100644 --- a/drivers/bluetooth/btqca.c +++ b/drivers/bluetooth/btqca.c @@ -148,8 +148,10 @@ static int qca_read_fw_build_info(struct hci_dev *hdev) } build_label = kstrndup(&edl->data[1], build_lbl_len, GFP_KERNEL); - if (!build_label) + if (!build_label) { + err = -ENOMEM; goto out; + } hci_set_fw_info(hdev, "%s", build_label); -- 2.43.0