From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0E4871AC25F; Thu, 6 Jun 2024 14:15:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683317; cv=none; b=GU5VhI/AkDHARkwJxwRcimGO0hU2v91tY4aXo3L8X8/P82M6wA4HQVpgWIOGxhJhJc6JeBQV5hDtTGwywSnlW1WO9sGaZ0HmEQ2sc+JmFa/EY/oQVCkkl1mkKpxue9sRvMo4TWBY2+KqnPc7TOjHbnAfgPOMiOzSlfsrXUNGhMw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683317; c=relaxed/simple; bh=BP9b7CGACDeHDt+9ZsbdlkLCDkueZF8RCkIkOQno5dU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Xa+rinz0mawzZ+rtmtGVr08KY9i1m+we7HcRdPDqt/YJg4HiU4RONjdxPpMrnD1yAGPLjwVl3MsAT3wPXjsY3aNqZtdVUw0UYBUwYu6IBrMVueTOyFTYOfXW30C4maHRzBmi29msz9jWA2QFycVJfnMB7LN6FvPQZh7ZqzTZTaw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=P8lWlebL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="P8lWlebL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E1CB9C32781; Thu, 6 Jun 2024 14:15:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683316; bh=BP9b7CGACDeHDt+9ZsbdlkLCDkueZF8RCkIkOQno5dU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P8lWlebLeFmkAw2N1L+EAYgiAQWhSXwALkXz6eYjAo8LUPwSUuj4hcL6rTMdYZnn/ dkl6W4QTCi+zqK0CkCL/7ftdDz9jnhQQuQNLPZpRN5YqkRN6hZaro0NWah+Xjeghx9 1MW1f69kjcx1M57iwGHaATPse2gZ+Mjyg0xUzcos= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Duoming Zhou , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6 257/744] ax25: Fix reference count leak issue of net_device Date: Thu, 6 Jun 2024 15:58:49 +0200 Message-ID: <20240606131740.648114066@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131732.440653204@linuxfoundation.org> References: <20240606131732.440653204@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Duoming Zhou [ Upstream commit 36e56b1b002bb26440403053f19f9e1a8bc075b2 ] There is a reference count leak issue of the object "net_device" in ax25_dev_device_down(). When the ax25 device is shutting down, the ax25_dev_device_down() drops the reference count of net_device one or zero times depending on if we goto unlock_put or not, which will cause memory leak. In order to solve the above issue, decrease the reference count of net_device after dev->ax25_ptr is set to null. Fixes: d01ffb9eee4a ("ax25: add refcount in ax25_dev to avoid UAF bugs") Suggested-by: Dan Carpenter Signed-off-by: Duoming Zhou Reviewed-by: Dan Carpenter Link: https://lore.kernel.org/r/7ce3b23a40d9084657ba1125432f0ecc380cbc80.1715247018.git.duoming@zju.edu.cn Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ax25/ax25_dev.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c index 52ccc37d5687a..c9d55b99a7a57 100644 --- a/net/ax25/ax25_dev.c +++ b/net/ax25/ax25_dev.c @@ -118,15 +118,10 @@ void ax25_dev_device_down(struct net_device *dev) list_for_each_entry(s, &ax25_dev_list, list) { if (s == ax25_dev) { list_del(&s->list); - goto unlock_put; + break; } } - dev->ax25_ptr = NULL; - spin_unlock_bh(&ax25_dev_lock); - ax25_dev_put(ax25_dev); - return; -unlock_put: dev->ax25_ptr = NULL; spin_unlock_bh(&ax25_dev_lock); netdev_put(dev, &ax25_dev->dev_tracker); -- 2.43.0