Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1978633ybb; Thu, 9 Apr 2020 12:35:49 -0700 (PDT) X-Google-Smtp-Source: APiQypIPkKt4HBFQaYh2x7IohHKe5dbzR6D5qF/SRtJKjJW5NREMRXSPjDXWfGe4u6LfNYxDl2kM X-Received: by 2002:a05:620a:8dc:: with SMTP id z28mr440911qkz.263.1586460949483; Thu, 09 Apr 2020 12:35:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586460949; cv=none; d=google.com; s=arc-20160816; b=sK351BGDsIk6LegjNlMhVVETTAN2U1DVLM7w16vOZ7rPK8a+Ws9TH6kSmV9FGo+Nme QLw3EJzJTSNdFGHCkgmfp48zPqMhniqz0FjsMOkgiPIQY3HiWIkCrYlyO2HzZ0LSqq+3 iutm1z5nM18llGUXnTTfN7LGMJ4iF7/HpCsREDFFpoVok8tb7K8fddpFmGjWEEm2pSCj /XDmIfUkfqEeekPEUr4i/Z9ezvf15mleillHz4nSwN4G4OFCwvH4z1Lz/21oHscGKScc x/ietA3C/+PWUpN8Bo4lEuncM33LH1EbcsnBBZqHUz15zZNKZTSjm4nti4UgTKF4kRru Ku2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=+CsBK5pSzGcRfu9K0BfKxINgECBUhqRy0lnWHHtdGcw=; b=gK3lqc6sKArFprMN3lfFtZTGP447qjEHTZI5IilxTyw4TeljGQhMLbPWInYXlfnDKb 8sbQ6qqFpSXjQ6iscM526A3s4ATLXEUvVvNVJXz5ZbdASHzbLjblOH3GBPutTalFy7UU TYpcNPlPS6kEmO21uiFLd4bkipXb0CFchMTymtqwUsJHyfpP9OugAPhUzSRoJn6NxWPw VCRQ/Xa+/LObLyPVc8AQUI0z07jmn5gL2d8UmpUT0mv+8gz43SkVvCTClPF+InpRZejz ainPVyvl6rXRjejr8QQ4XhLs/9C49uzaCu1osldD47Xj+k82QSCS1ThUf4XuIwp/72Uc Lo3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cNtxuLtI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l19si6225144qvy.194.2020.04.09.12.35.33; Thu, 09 Apr 2020 12:35:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cNtxuLtI; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726793AbgDITcV (ORCPT + 99 others); Thu, 9 Apr 2020 15:32:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:58490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726703AbgDITcV (ORCPT ); Thu, 9 Apr 2020 15:32:21 -0400 Received: from kicinski-fedora-PC1C0HJN (unknown [163.114.132.1]) (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 69F4820757; Thu, 9 Apr 2020 19:32:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586460741; bh=2eHWQ/4goNgPuFGvtFabW7ncIzGtyqDsPe64tABuLfQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=cNtxuLtIYGSMwtXWmzjBWIk0WUJ8Z7/MRAVbsF2tkTfYtlTOcqlsKK9/O64V3XkhC 3yDXpHXx3WCBI/p59yn3wR2qqQk27rI74cfj2raq9RIH9t6LBSX3Aco7jV1BM7ZYjF o1VfDHy6ZpWrQeDDXYjn4bt0OMRWgYzvcUCm9P40= Date: Thu, 9 Apr 2020 12:32:19 -0700 From: Jakub Kicinski To: Keita Suzuki Cc: takafumi.kubota1012@sslab.ics.keio.ac.jp, davem@davemloft.net, 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: Re: [PATCH] nfp: Fix memory leak in nfp_resource_acquire() Message-ID: <20200409123203.1b5f6534@kicinski-fedora-PC1C0HJN> In-Reply-To: <20200409174113.28635-1-keitasuzuki.park@sslab.ics.keio.ac.jp> References: <20200409150210.15488-1-keitasuzuki.park@sslab.ics.keio.ac.jp> <20200409174113.28635-1-keitasuzuki.park@sslab.ics.keio.ac.jp> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 9 Apr 2020 17:41:11 +0000 Keita Suzuki wrote: > 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(). I don't see a leak here. Maybe you could rephrase the description to make things clearer? AFAICS nfp_resource_try_acquire() calls nfp_cpp_mutex_free(res->mutex) if it's about to return an error. We can only hit msleep or time check if it returned an error.