linux-kernel - [PATCH] ucounts: fix counter leak in inc_rlimit_get

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241031045602.309600-1-avagin@google.com>
Date: Thu, 31 Oct 2024 04:56:01 +0000
From: Andrei Vagin <avagin@...gle.com>
To: "Eric W. Biederman" <ebiederm@...ssion.com>, Kees Cook <kees@...nel.org>
Cc: Roman Gushchin <roman.gushchin@...ux.dev>, linux-kernel@...r.kernel.org, 
	Andrei Vagin <avagin@...gle.com>, Alexey Gladkov <legion@...nel.org>, stable@...r.kernel.org
Subject: [PATCH] ucounts: fix counter leak in inc_rlimit_get_ucounts()

The inc_rlimit_get_ucounts() increments the specified rlimit counter and
then checks its limit. If the value exceeds the limit, the function
returns an error without decrementing the counter.

Fixes: 15bc01effefe ("ucounts: Fix signal ucount refcounting")
Tested-by: Roman Gushchin <roman.gushchin@...ux.dev>
Co-debugged-by: Roman Gushchin <roman.gushchin@...ux.dev>
Cc: Kees Cook <kees@...nel.org>
Cc: Andrei Vagin <avagin@...gle.com>
Cc: "Eric W. Biederman" <ebiederm@...ssion.com>
Cc: Alexey Gladkov <legion@...nel.org>
Cc: <stable@...r.kernel.org>
Signed-off-by: Andrei Vagin <avagin@...gle.com>
---
 kernel/ucount.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/kernel/ucount.c b/kernel/ucount.c
index 8c07714ff27d..16c0ea1cb432 100644
--- a/kernel/ucount.c
+++ b/kernel/ucount.c
@@ -328,13 +328,12 @@ long inc_rlimit_get_ucounts(struct ucounts *ucounts, enum rlimit_type type)
 		if (new != 1)
 			continue;
 		if (!get_ucounts(iter))
-			goto dec_unwind;
+			goto unwind;
 	}
 	return ret;
-dec_unwind:
+unwind:
 	dec = atomic_long_sub_return(1, &iter->rlimit[type]);
 	WARN_ON_ONCE(dec < 0);
-unwind:
 	do_dec_rlimit_put_ucounts(ucounts, iter, type);
 	return 0;
 }
-- 
2.47.0.163.g1226f6d8fa-goog