From patchwork Mon Mar 4 21:29:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 13581274 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E52F1EB5A for ; Mon, 4 Mar 2024 21:29:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709587776; cv=none; b=racq3ReQWZYoElvNQvAILWxZTREXeAeIevqezDkZpRhQGXFPQGeik5qAajnPy5iEWsRNStMsVJCUSrjPZBn1IgLi/g1FczOxoUHOro21THhN4O2l0qGvzdkLC7kLzFLL/oH5N79ahc/2JqPq+131806x09fr0rMdAvCArKn8zAU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709587776; c=relaxed/simple; bh=rNbVohFr1lX5bqscK9PE0eqcrmu5KWoLl5ZCdmYHEKc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=cnnoivapu4OJ4AQ2gZfgtT1F5Lb5ZI6buS3c9HnIYhbw6HAww9AX6lmOSsUo4ShmLkgq275Q0eQux+ViXzzup2X45fPdchLZux6rICSV6bIiwx7iNNxU3oRkIuoj69TqNivCSX8GSZb/gSTcgys0LHHPNjVF0WP3Rt20G8G89RU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=gACpX3zU; arc=none smtp.client-ip=209.85.215.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="gACpX3zU" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-53fa455cd94so4340508a12.2 for ; Mon, 04 Mar 2024 13:29:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709587775; x=1710192575; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NqP29r2eazzveHXly0NG7eBRSXtQow90bgEnhzwvqjk=; b=gACpX3zUP4l6vhdrrqlfqMJ1OlGKwNF+MDclwQ/YZTq6tFagrF9MPUTMfS2Xk0RuqU +PCcrhO7WCPkI/v49m/RPQoCxXI2HbM6pR1PYucFL2PLZoDeRCoR27JeiLBxdfZvht4S hVNaUycxK7aV9vBpCFBzrhwk5jOOak4ju6wAI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709587775; x=1710192575; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NqP29r2eazzveHXly0NG7eBRSXtQow90bgEnhzwvqjk=; b=HUeyQN92KCEI8bdUCF3IIz9Nfk4vS5pbHN70TuV3R2h/eWm4j6n5EMb6AOhdKbYf6z D5ko/PAihm5XJ9WPb/+lG+y+8nrex56xciAQppCWpdBZXBglB3e7vHTLDeNWU/qQut4g KhTUvLThjyWPhFFRdeoZsJ6CWtY9/s1Oqwh/nA93mZd81ZySSkdZJ0Fnd6n5GcGvOW7x d12IJXFo7Ms+Rs7n8QJNxQ7P24WFMqdSjVQ0cijZai/9PQQlWqmI28lr6nOltby3sKD+ dzEs62fEd2t13tryYHvAZlTsUIgG9cMDZm85eQ1QoNnEh3NYMd4E8ZzI9awxG/2hS951 Yq8A== X-Forwarded-Encrypted: i=1; AJvYcCVXJRUlXO7T1yVhq0g+puOEiXBRVurRz59Tri36P3Hxjb/QhTOGvDg/p1IRDGTPqwSbiJOHknlzm1Y8v9CPTb9L5u0VXU70 X-Gm-Message-State: AOJu0Yyn8sTMz7ZVKRuhugPvOUcP5unxnJhSkmBoyW3BJooGUXtES3Nj lb3cwONYBqyzvUG5sU+jL+9KUW1JaFAmuTgAe9PlxLpDuAv4UbmrjOX7Ie6HYA== X-Google-Smtp-Source: AGHT+IGU8j4KvUz1DwEvLk09jvZcoIyKd2+u1vN7u+r7I94kyQI8R7YbQP3ZcJO4Su8cxFfFi8huzQ== X-Received: by 2002:a05:6a20:1609:b0:19e:3173:4bdd with SMTP id l9-20020a056a20160900b0019e31734bddmr2543274pzj.2.1709587774753; Mon, 04 Mar 2024 13:29:34 -0800 (PST) Received: from www.outflux.net ([198.0.35.241]) by smtp.gmail.com with ESMTPSA id b76-20020a63344f000000b005dc4829d0e1sm7871696pga.85.2024.03.04.13.29.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 13:29:33 -0800 (PST) From: Kees Cook To: Jakub Kicinski Cc: Kees Cook , "David S. Miller" , Eric Dumazet , Paolo Abeni , netdev@vger.kernel.org, David Ahern , Kuniyuki Iwashima , Abel Wu , Breno Leitao , Alexander Mikhalitsyn , David Howells , linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH v3] sock: Use unsafe_memcpy() for sock_copy() Date: Mon, 4 Mar 2024 13:29:31 -0800 Message-Id: <20240304212928.make.772-kees@kernel.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2952; i=keescook@chromium.org; h=from:subject:message-id; bh=rNbVohFr1lX5bqscK9PE0eqcrmu5KWoLl5ZCdmYHEKc=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBl5j07GdCOGFZU/xyLkr9A/AuF584WDoUWMKmnm rO64d+93gyJAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCZeY9OwAKCRCJcvTf3G3A JnnqEACD182Vp6ijr9bKxzF77cbxV5/bfYctEwChHnWMPKpfSkhfPu4gBkvIYpFMZ7rwLhSHou+ UhddgLEJsmZk5GWJZmgO6WfcSETPxq8mGCjVOgcSD0JkCyUxzc6lEzMPKYtKlCXqS6KZRa/DWXm eZmxtRNj+owwM1gAIazXxZhNqfTRd/4qGJN9q0GsaqEOciPLcc5U7N8dirO7fS+47iwyQqSq1u4 q560sRl2J3w0/9NvPHzFvWcnanuhRaQVX1ah6YTo3B3+hcsp4W/888bEKzm+garbBxj/aewNybG 7oRd4NzY+JSeToqBH9dZCtkWkfzgGBO9laipqd/m+xieLa7Fj8e8zVThKsxx0cg/iMyGqf4fFwg aJtWPInCnSo7qKbKaue34lFeuiPCErczwwOjf/54eTgr/hW8urm1Orj41vZiQMt9Ew6FaK5Jn3V hCQneYBBizCkp2UhCujKFP3AOoqBbdKCODlR4ZOGgWUO6T2cehI38cG4tDRQtTXhHp6qYYqQg7k 04q+BqYrGiNbMiBD839UYDgoMvbG/z8T/GMI6F2yBAJPnsPsJ3JArQECblvstN64t4bzxLn/wvD LyewMsxgh4mJ1iZgb+qPnk+kRbI51vVW1H6RjEYlZnG9ayHsZSRCB86TYQ4m7XXkdUZc5J5O8lG l1nwepV cfDK8Ucw== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 X-Patchwork-Delegate: kuba@kernel.org While testing for places where zero-sized destinations were still showing up in the kernel, sock_copy() and inet_reqsk_clone() were found, which are using very specific memcpy() offsets for both avoiding a portion of struct sock, and copying beyond the end of it (since struct sock is really just a common header before the protocol-specific allocation). Instead of trying to unravel this historical lack of container_of(), just switch to unsafe_memcpy(), since that's effectively what was happening already (memcpy() wasn't checking 0-sized destinations while the code base was being converted away from fake flexible arrays). Avoid the following false positive warning with future changes to CONFIG_FORTIFY_SOURCE: memcpy: detected field-spanning write (size 3068) of destination "&nsk->__sk_common.skc_dontcopy_end" at net/core/sock.c:2057 (size 0) Signed-off-by: Kees Cook Reviewed-by: Simon Horman --- Cc: Jakub Kicinski Cc: "David S. Miller" Cc: Eric Dumazet Cc: Paolo Abeni Cc: netdev@vger.kernel.org v3: fix inet_reqsk_clone() comment v2: https://lore.kernel.org/lkml/20240216232220.it.450-kees@kernel.org v1: https://lore.kernel.org/lkml/20240216204423.work.066-kees@kernel.org --- net/core/sock.c | 5 +++-- net/ipv4/inet_connection_sock.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 0a7f46c37f0c..b7ea358eb18f 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2053,8 +2053,9 @@ static void sock_copy(struct sock *nsk, const struct sock *osk) memcpy(nsk, osk, offsetof(struct sock, sk_dontcopy_begin)); - memcpy(&nsk->sk_dontcopy_end, &osk->sk_dontcopy_end, - prot->obj_size - offsetof(struct sock, sk_dontcopy_end)); + unsafe_memcpy(&nsk->sk_dontcopy_end, &osk->sk_dontcopy_end, + prot->obj_size - offsetof(struct sock, sk_dontcopy_end), + /* alloc is larger than struct, see sk_prot_alloc() */); #ifdef CONFIG_SECURITY_NETWORK nsk->sk_security = sptr; diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 459af1f89739..6a14a44aa161 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c @@ -906,8 +906,9 @@ static struct request_sock *inet_reqsk_clone(struct request_sock *req, memcpy(nreq_sk, req_sk, offsetof(struct sock, sk_dontcopy_begin)); - memcpy(&nreq_sk->sk_dontcopy_end, &req_sk->sk_dontcopy_end, - req->rsk_ops->obj_size - offsetof(struct sock, sk_dontcopy_end)); + unsafe_memcpy(&nreq_sk->sk_dontcopy_end, &req_sk->sk_dontcopy_end, + req->rsk_ops->obj_size - offsetof(struct sock, sk_dontcopy_end), + /* alloc is larger than struct, see above */); sk_node_init(&nreq_sk->sk_node); nreq_sk->sk_tx_queue_mapping = req_sk->sk_tx_queue_mapping;