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 4260D31A817; Wed, 17 Sep 2025 12:37:54 +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=1758112674; cv=none; b=QNrByyTh5WpildRtdWPxAQHOhxgXjejEhMYDjp/lnyct+fUd4JqbVuMqn0azORukTYJI2SKvVsRi5FmZ0ZQFD8ikHQ6gdDyJSMkmsot+/l0G7rtr4/eL+apz2QgXtHfaEXlHjfTBVGJD3KzfU50Z41aEdzIcuXwQB5Ji2j0crfI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758112674; c=relaxed/simple; bh=CB/aVe380z6ZXIYUm2ziZ8Qv3ALMM1l6DmEXBjskylM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PFHz46GkyaK0TW42hcR0YjJ8aVgeOGWxEQ4VuBLCnsf5cRDOMucKjxS2aDIvHnBCM/WNqxXUn9fmEuqFR6/SQDWzVR8FSkJrmQfPSZzW9QbDgBkZ6I3uXi+Q+/BYzjd1JfL/jvaUOoM29zqA/aamWBSlFApH9nsHvH2kmX7SL6Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GXjzeHD/; 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="GXjzeHD/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4A3AC4CEF7; Wed, 17 Sep 2025 12:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758112674; bh=CB/aVe380z6ZXIYUm2ziZ8Qv3ALMM1l6DmEXBjskylM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GXjzeHD/yxTE3e7BeR+gp7F7D75pCsHXsJixXtxrOJl8DIAB/530cu6CDo4OMM8kx lbNakM1kvBKun8esfrnt7nleBEtR4Ce7oNJH+9GSR4pz1UcUjJwRPeUz3jsvqEI8hb n0ldUDKkk2OCt4rsvZVOeDLF05fKlQM50t3H7DF0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Stanislav Fort , Daniel Borkmann , Vadim Fedorenko , Alexei Starovoitov , Sasha Levin Subject: [PATCH 6.16 041/189] bpf: Fix out-of-bounds dynptr write in bpf_crypto_crypt Date: Wed, 17 Sep 2025 14:32:31 +0200 Message-ID: <20250917123352.864976810@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250917123351.839989757@linuxfoundation.org> References: <20250917123351.839989757@linuxfoundation.org> User-Agent: quilt/0.68 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.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Borkmann [ Upstream commit f9bb6ffa7f5ad0f8ee0f53fc4a10655872ee4a14 ] Stanislav reported that in bpf_crypto_crypt() the destination dynptr's size is not validated to be at least as large as the source dynptr's size before calling into the crypto backend with 'len = src_len'. This can result in an OOB write when the destination is smaller than the source. Concretely, in mentioned function, psrc and pdst are both linear buffers fetched from each dynptr: psrc = __bpf_dynptr_data(src, src_len); [...] pdst = __bpf_dynptr_data_rw(dst, dst_len); [...] err = decrypt ? ctx->type->decrypt(ctx->tfm, psrc, pdst, src_len, piv) : ctx->type->encrypt(ctx->tfm, psrc, pdst, src_len, piv); The crypto backend expects pdst to be large enough with a src_len length that can be written. Add an additional src_len > dst_len check and bail out if it's the case. Note that these kfuncs are accessible under root privileges only. Fixes: 3e1c6f35409f ("bpf: make common crypto API for TC/XDP programs") Reported-by: Stanislav Fort Signed-off-by: Daniel Borkmann Cc: Vadim Fedorenko Reviewed-by: Vadim Fedorenko Link: https://lore.kernel.org/r/20250829143657.318524-1-daniel@iogearbox.net Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- kernel/bpf/crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/crypto.c b/kernel/bpf/crypto.c index 94854cd9c4cc3..83c4d9943084b 100644 --- a/kernel/bpf/crypto.c +++ b/kernel/bpf/crypto.c @@ -278,7 +278,7 @@ static int bpf_crypto_crypt(const struct bpf_crypto_ctx *ctx, siv_len = siv ? __bpf_dynptr_size(siv) : 0; src_len = __bpf_dynptr_size(src); dst_len = __bpf_dynptr_size(dst); - if (!src_len || !dst_len) + if (!src_len || !dst_len || src_len > dst_len) return -EINVAL; if (siv_len != ctx->siv_len) -- 2.51.0