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=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 3B9BFC2BA19 for ; Thu, 9 Apr 2020 17:42:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1413020771 for ; Thu, 9 Apr 2020 17:42:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sslab.ics.keio.ac.jp header.i=@sslab.ics.keio.ac.jp header.b="GxK81g5F" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726621AbgDIRmN (ORCPT ); Thu, 9 Apr 2020 13:42:13 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:38429 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726082AbgDIRmM (ORCPT ); Thu, 9 Apr 2020 13:42:12 -0400 Received: by mail-pg1-f196.google.com with SMTP id p8so1860072pgi.5 for ; Thu, 09 Apr 2020 10:42:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sslab.ics.keio.ac.jp; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0wmybZU2XYC2ZQZ6lGBEg07+Q6ic1u6zQ08/WgqtdVE=; b=GxK81g5FBJ92hDAuB3j7A6f3OXdPrAuS646UimLd/yyBcfDvfcaSaqv6N3slbFBySb 7f5d1EolpYJ4Hg7bdcUtW4cH5UOE5WYQKSUPmCajFmfqivS6UOP2pbNO8ulvrNur29y0 QnKB1OBb7RJxn2hGmyYlD8MFlBiGU+GZQTgbQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0wmybZU2XYC2ZQZ6lGBEg07+Q6ic1u6zQ08/WgqtdVE=; b=lZgDKgUqmM1xcwbo9T85ptIt/wRd7AbtL2x/bStOzfwPaJau0isLkeD281qFHZyjtF 12G4/F2on3WL32huQdJIjid4cfkcezsBYWJM1DnXufsQ6hPKARgTZFoTLd1JEttmy7rY wT0NcQOPHkVFeM8nBeilELVsCTcX9cA5XElnfZKrSlP7cOOmnFbginSQZbpWtTfWCYJJ jzIAg6sxQr98C8QcWfL1OgLaWawVAlNnVWuHXyCSio/sIinu7IxNH8KUjxficDtbADR+ LQGQ1jM5+aaxMZNwncU6upFaR8OsvT57rRll5H7eh3ox8kZJ4aa5Uhe9nitASsrLAXQv GE0g== X-Gm-Message-State: AGi0PuYU2066xp6TFCo/U518i9uBJDujt+0ebsiF959eZVO++FAVhUHF 3cE6TrqvtOxqFfqHHkTy0IqAgQ== X-Google-Smtp-Source: APiQypJ4shH8Bv2b1K68QcLJdeS1QZon1I4ElY5DpScBRbUghLnzZ2+fu/chvC9jeb2siGu3fNepeQ== X-Received: by 2002:a62:4ec4:: with SMTP id c187mr677435pfb.223.1586454132444; Thu, 09 Apr 2020 10:42:12 -0700 (PDT) Received: from brooklyn.i.sslab.ics.keio.ac.jp (sslab-relay.ics.keio.ac.jp. [131.113.126.173]) by smtp.googlemail.com with ESMTPSA id e187sm19140287pfe.143.2020.04.09.10.42.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2020 10:42:11 -0700 (PDT) From: Keita Suzuki Cc: keitasuzuki.park@sslab.ics.keio.ac.jp, takafumi.kubota1012@sslab.ics.keio.ac.jp, davem@davemloft.net, Jakub Kicinski , oss-drivers@netronome.com (open list:NETRONOME ETHERNET DRIVERS), netdev@vger.kernel.org (open list:NETWORKING DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] nfp: Fix memory leak in nfp_resource_acquire() Date: Thu, 9 Apr 2020 17:41:11 +0000 Message-Id: <20200409174113.28635-1-keitasuzuki.park@sslab.ics.keio.ac.jp> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200409150210.15488-1-keitasuzuki.park@sslab.ics.keio.ac.jp> References: <20200409150210.15488-1-keitasuzuki.park@sslab.ics.keio.ac.jp> To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch fixes a memory leak in nfp_resource_acquire(). res->mutex is alllocated in nfp_resource_try_acquire(). However, when msleep_interruptible() or time_is_before_eq_jiffies() fails, it falls into err_fails path where res is freed, but res->mutex is not. Fix this by changing call to free to nfp_resource_release(). Signed-off-by: Keita Suzuki --- drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c index ce7492a6a98f..95e7bdc95652 100644 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_resource.c @@ -200,7 +200,7 @@ nfp_resource_acquire(struct nfp_cpp *cpp, const char *name) err_free: nfp_cpp_mutex_free(dev_mutex); - kfree(res); + nfp_resource_release(res); return ERR_PTR(err); } -- 2.17.1