From 24ffe8caa6a5bf05ccb3bcbe672a1376f2b702d0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 27 Dec 2024 16:19:25 +0000 Subject: [PATCH] Revert "llc: Improve setsockopt() handling of malformed user input" This reverts commit 981d647c6f664871cc75ad424eead207df7dc571 which is commit 1465036b10be4b8b00eb31c879e86de633ad74c1 upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I33d7231dae0f23df8750010315515440e2687a9c Signed-off-by: Greg Kroah-Hartman --- net/llc/af_llc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 447031c5eac4..8e3be0009f60 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -1099,7 +1099,7 @@ static int llc_ui_setsockopt(struct socket *sock, int level, int optname, lock_sock(sk); if (unlikely(level != SOL_LLC || optlen != sizeof(int))) goto out; - rc = copy_safe_from_sockptr(&opt, sizeof(opt), optval, optlen); + rc = copy_from_sockptr(&opt, optval, sizeof(opt)); if (rc) goto out; rc = -EINVAL;