Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3023853pxb; Mon, 18 Oct 2021 06:49:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4OpOdaWYQa8qf7kMDjua8BWeZo+UOol8+5XkFphFLajGZDZte59uTgfj6bcbxUQcNs7w1 X-Received: by 2002:a63:1656:: with SMTP id 22mr24015216pgw.20.1634564948601; Mon, 18 Oct 2021 06:49:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634564948; cv=none; d=google.com; s=arc-20160816; b=XyDUEfVdtdQVWMp8PSoedAVx4JL/StXPpnoeKfbKGTEdlk8xjRJrLj7xvd1ONolfw8 rQBjOMv+bo6WTplJ5qKl9AGO0sOBiPguF9ffgnjojsPRyEvEj7Xb91qfL98phH6N0+mt 0rwmq+xQwcIvFPvhbsy7sjMRo6AO3ePYXW/mIOKg82Z5V5oOttNgh06idRHznuHcHOUr 6fZ7RKZgHAkV7mPB33t6qqdtKjIVkPIfQwKc33oP5BZJB16ev5+ebVkyagSUVInjliI6 H3syUQxyxpNjhSGSItaS+u7LoNKMEyjUfqpnwh03QNgpJ14Tux/Mu5bmbSzhk71u7LHg Hxnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=29ORYWxsJV0qeX/GPyYIqt57Gao7OeoN4j6pJPaXww4=; b=feRYANK/fdDfEM1QDwZN42Fr2Lgs/JVgerBmIrZUjWSVadqC+qfBSiaHLJvEv91puq b9HVaQVMybHeDmaJ1bS8stDHOEmmeZH+w8S0l5sZ2zBm69A2aJi1NxmKijJb0+wbR3K7 V543vfUff1z6JnRfYn4nt1fwXiJ18NNWfTmZKFL7AyZMr7xXxw2qm6ejQLuf1H2FNtSf FA8ufGTzApRTNSmn2w9XNO3Po20sTVocuyP2YcoV3G15+xnJKUf+t/4MRz5KZ83S7zZW 2LS7X78FZQFl8d6t3eNP+r4u9yTe03vEb6qayviMIbfXiAbxNh1zu7mhdE6+UHbHHdKB SJjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ak6Splnj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id pf3si25749983pjb.53.2021.10.18.06.48.55; Mon, 18 Oct 2021 06:49:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ak6Splnj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233802AbhJRNt0 (ORCPT + 99 others); Mon, 18 Oct 2021 09:49:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:49552 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232736AbhJRNrl (ORCPT ); Mon, 18 Oct 2021 09:47:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 516006136A; Mon, 18 Oct 2021 13:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1634564185; bh=F6/j8CSR2cmasNkSLypwl3nDj6yUpxbHCMsipKhXnyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ak6SplnjeB0wkoXhWKsFoYM7kEoVX6aUDkxrpfyQ8zJLOWxjlF3XynX0QB1QNFz0W su8XBRLfa/3NMKwA+lLnw9KMzkZlRECRx8U6Gf1SxqyF0AVqhZ2EiLZhJsnrv9auAd sp6/EUMukSgzEqpmQ5gQ/f99aCjMEMkM68ZKWYpY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ziyang Xuan , Krzysztof Kozlowski , Jakub Kicinski Subject: [PATCH 5.10 080/103] NFC: digital: fix possible memory leak in digital_tg_listen_mdaa() Date: Mon, 18 Oct 2021 15:24:56 +0200 Message-Id: <20211018132337.441069012@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211018132334.702559133@linuxfoundation.org> References: <20211018132334.702559133@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ziyang Xuan commit 58e7dcc9ca29c14e44267a4d0ea61e3229124907 upstream. 'params' is allocated in digital_tg_listen_mdaa(), but not free when digital_send_cmd() failed, which will cause memory leak. Fix it by freeing 'params' if digital_send_cmd() return failed. Fixes: 1c7a4c24fbfd ("NFC Digital: Add target NFC-DEP support") Signed-off-by: Ziyang Xuan Reviewed-by: Krzysztof Kozlowski Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/nfc/digital_core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) --- a/net/nfc/digital_core.c +++ b/net/nfc/digital_core.c @@ -277,6 +277,7 @@ int digital_tg_configure_hw(struct nfc_d static int digital_tg_listen_mdaa(struct nfc_digital_dev *ddev, u8 rf_tech) { struct digital_tg_mdaa_params *params; + int rc; params = kzalloc(sizeof(*params), GFP_KERNEL); if (!params) @@ -291,8 +292,12 @@ static int digital_tg_listen_mdaa(struct get_random_bytes(params->nfcid2 + 2, NFC_NFCID2_MAXSIZE - 2); params->sc = DIGITAL_SENSF_FELICA_SC; - return digital_send_cmd(ddev, DIGITAL_CMD_TG_LISTEN_MDAA, NULL, params, - 500, digital_tg_recv_atr_req, NULL); + rc = digital_send_cmd(ddev, DIGITAL_CMD_TG_LISTEN_MDAA, NULL, params, + 500, digital_tg_recv_atr_req, NULL); + if (rc) + kfree(params); + + return rc; } static int digital_tg_listen_md(struct nfc_digital_dev *ddev, u8 rf_tech)