From patchwork Tue Sep 15 14:12:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 309646 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE63DC433E2 for ; Tue, 15 Sep 2020 23:42:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 92E5220720 for ; Tue, 15 Sep 2020 23:42:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600213332; bh=XbwKwVJGhjg2g05fL+HKZshm0QMK9+MQv21YwmNwFIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Lao2LXS+IaqTQD/j1i8+/TvDxW4X/36wdq9BozJyF6MbvO7xEERHTjpVbCQxNrxxq ZUCMnEZ5WFWTAkWBm9UFW3dfhWDr8fb1DoohQV7Gy9F62F0umAABLtNP+pYRC0cKWI H0rvQ9ClMbYSeKsBmj4zxvQOSRA6f2V2hhJl6W4k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727075AbgIOXmK (ORCPT ); Tue, 15 Sep 2020 19:42:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:47670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727107AbgIOOem (ORCPT ); Tue, 15 Sep 2020 10:34:42 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D461921D94; Tue, 15 Sep 2020 14:15:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600179341; bh=XbwKwVJGhjg2g05fL+HKZshm0QMK9+MQv21YwmNwFIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bnrs+7L+/cUIBBXXl16yb5oTZhWhxvopnGt7MipqV1FvtCkNHhtwwxgHM21SlzCEc y+ffM/gN4LLWdO63oHdgAXSrlhffqtgO3ndVcwmc6ngZq6fsdoG+BwkxSD7rpMupEy Fva/Jmn0J5Jm+Dqmu3DO4u4PGK882eodfOmR39WQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dinghao Liu , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 21/78] NFC: st95hf: Fix memleak in st95hf_in_send_cmd Date: Tue, 15 Sep 2020 16:12:46 +0200 Message-Id: <20200915140634.607762500@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200915140633.552502750@linuxfoundation.org> References: <20200915140633.552502750@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dinghao Liu [ Upstream commit f97c04c316d8fea16dca449fdfbe101fbdfee6a2 ] When down_killable() fails, skb_resp should be freed just like when st95hf_spi_send() fails. Signed-off-by: Dinghao Liu Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/nfc/st95hf/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nfc/st95hf/core.c b/drivers/nfc/st95hf/core.c index 01acb6e533655..c4b6e29c07192 100644 --- a/drivers/nfc/st95hf/core.c +++ b/drivers/nfc/st95hf/core.c @@ -981,7 +981,7 @@ static int st95hf_in_send_cmd(struct nfc_digital_dev *ddev, rc = down_killable(&stcontext->exchange_lock); if (rc) { WARN(1, "Semaphore is not found up in st95hf_in_send_cmd\n"); - return rc; + goto free_skb_resp; } rc = st95hf_spi_send(&stcontext->spicontext, skb->data,