From mboxrd@z Thu Jan 1 00:00:00 1970 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=-14.2 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 48E7FC43466 for ; Mon, 21 Sep 2020 16:35:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F11A8239ED for ; Mon, 21 Sep 2020 16:35:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706118; bh=+ZCX40SIB3C8UjN8xU0IOoWXxCKcI5Kh/UgQQx8xTVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v+TSG3S0hBDLyc/gRmgXR7rQ945TIyZ6rUBo+kTEVQFhaVT4O2hVCWEFQsaA/LLEw s+PsTxeOpmjC5TeXtvgFBSbRYTlSQn+gUosTe9fspUYg2rdVzIBqfRS10g9vPa92dx 2JQ/r5brwjGSYDU5Gv51eadaYjzzk4FKLjAcREK4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728847AbgIUQfQ (ORCPT ); Mon, 21 Sep 2020 12:35:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:33430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728787AbgIUQei (ORCPT ); Mon, 21 Sep 2020 12:34:38 -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 408B523976; Mon, 21 Sep 2020 16:34:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600706077; bh=+ZCX40SIB3C8UjN8xU0IOoWXxCKcI5Kh/UgQQx8xTVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HHU3a29T7AmnYNZ1i2DwAZe2sAZLCfpcFKXNE+LFqW4jyu8O3SfDUM6LHlqsxJ9A3 soU75osI4z3E/sCmd5szugzqbMCYKlij+CS+Nj2d1NinF6mvEV3yDZhbdNUGWg5vv5 3cPz2mMyHb45pnOj2jSqXY7T6ffxPHuKhhx6jL5Y= 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.9 06/70] NFC: st95hf: Fix memleak in st95hf_in_send_cmd Date: Mon, 21 Sep 2020 18:27:06 +0200 Message-Id: <20200921162035.420189443@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200921162035.136047591@linuxfoundation.org> References: <20200921162035.136047591@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: 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 850e75571c8ee..bb1e878913f3a 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, -- 2.25.1