Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 80E3F3AC17; Sat, 12 Sep 2026 15:08:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789225720; cv=none; b=dISiN/K2M5vwixjGPRdJTNML9cwvWr/OHzUXPULSi3emkG5ObNVxuY62ADYnYico8aDJB8AXFaYrWQCSfrZ+Bt2S5hXUZOd8plZYlvcP92v+uOdQYnFe69rPWX2Aj1cr9oXlrLhLeYnL0AW9XYwY4ZXZR93F7asBCUXeHauPGWk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789225720; c=relaxed/simple; bh=ZO/InqaJd2z2i8OT0KaDmZqgFpvzFPUrwjglYapV6JY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hm5E6JbJi+nVrSphGiFq2JWseICnDOXl5Elbu78EXFIDdjHa95+ROTeewDP1iaiGFpsuowmftRmX9iHpkZQM20WBYwmp5PihB2/iFpduUfxV0i5wypR625ZLvIGPkcDhCidFPfJNW4iQmz7Q/Ybkhm4zufKc9mrq3zN15/xQD88= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=O7X6mYty; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="O7X6mYty" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 312321F000FF; Sat, 12 Sep 2026 15:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789225719; bh=mDj8zj6ofBCYcyoQa9BNojZqRnCPMH0+9V4VqBoDT/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=O7X6mYtyY5SZlx5xrfaSAsNyxcHBS4ZHt5PhCwyyZySApgv3E5McS7L9kjNr3Gtic PTWzrGgJiqqcRmUk6VvoqrDkfQ3OS9kqwf5AphCRFmp+RkDQLvvCwKVpH257QtvUMf F/8ugctu7QtPFHKJmXm6n32h23RMlEY24BjMWAFQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sechang Lim , Junseo Lim , Daniel Borkmann , Emil Tsalapatis , Sasha Levin Subject: [PATCH 6.6 1255/1424] bpf: Reject negative optlen in cgroup getsockopt hook Date: Sat, 12 Sep 2026 09:01:27 +0200 Message-ID: <20260912065635.386473532@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.279695368@linuxfoundation.org> References: <20260912065607.279695368@linuxfoundation.org> User-Agent: quilt/0.69 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: Junseo Lim [ Upstream commit 1b5aacd5b2419b0790e955e466d389a61c79b4b1 ] A cgroup getsockopt BPF program can shrink ctx->optlen after the kernel getsockopt handler has run. The kernel-buffer variant, used by TCP_ZEROCOPY_RECEIVE, only rejects values larger than the original length. If BPF writes a negative optlen, that value is accepted and propagated back to the TCP getsockopt code. It can then be passed to copy_to_sockptr() as a size_t and trigger the hardened usercopy bytes > INT_MAX warning. Reject negative ctx.optlen in __cgroup_bpf_run_filter_getsockopt_kern(), matching the lower-bound validation already present in the sockptr-based getsockopt hook. Fixes: 9cacf81f8161 ("bpf: Remove extra lock_sock for TCP_ZEROCOPY_RECEIVE") Reported-by: Sechang Lim Signed-off-by: Junseo Lim Signed-off-by: Daniel Borkmann Reviewed-by: Emil Tsalapatis Link: https://lore.kernel.org/bpf/187a4d756275aaaee5d65eecb63c1477b3b66554.1786448307.git.zirajs7@gmail.com Signed-off-by: Sasha Levin --- kernel/bpf/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index 0455c481bf008..0a422be3b0390 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -2061,7 +2061,7 @@ int __cgroup_bpf_run_filter_getsockopt_kern(struct sock *sk, int level, if (ret < 0) return ret; - if (ctx.optlen > *optlen) + if (ctx.optlen > *optlen || ctx.optlen < 0) return -EFAULT; /* BPF programs can shrink the buffer, export the modifications. -- 2.53.0