From patchwork Thu Mar 24 11:14:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 1608980 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=h4MQDUJ/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KPN2y6jNRz9s1l for ; Thu, 24 Mar 2022 22:16:42 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nXLSF-0006zC-8S; Thu, 24 Mar 2022 11:16:35 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nXLSC-0006wH-C3 for kernel-team@lists.ubuntu.com; Thu, 24 Mar 2022 11:16:32 +0000 Received: from localhost.localdomain (1.general.cascardo.us.vpn [10.172.70.58]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 589253F63E for ; Thu, 24 Mar 2022 11:16:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1648120592; bh=+5EsQa92oGUFk6HiKRT18yd61lQ5ve2SdMTaPB5HkI8=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=h4MQDUJ/3oTD3iUvvlGndPzyQCs6bbl9sg0v/Q5mvlrbB9gw9p0CacOFTaf4OVTqN aHyfFqm4nHdn+IV8xiSiwBTMdqCv0yWyXrbjQq3dAkQdDxh0d5xdLJ/foadvXo/r3s 2Yqz+UX30T9E2YvR573zeVjf3agHVJvPSu8zN1WIh0NITMV6c+OS+66ACI/1/4dmbf CLYHPwweiqepTw4Gee62vSKw4fesl3AzZUYUzlfqYq93Ig+1ZEa0Fcj1bMAXd/JD+p Ze6tRjwuJNOy4pk1/esc/BPyX/ATslRhU5txFP6lvp724D/+OpWfPARKjfmnaqlD9R +w3iXcx/iXx0w== From: Thadeu Lima de Souza Cascardo To: kernel-team@lists.ubuntu.com Subject: [SRU Impish/OEM-5.14 1/2] sock: remove one redundant SKB_FRAG_PAGE_ORDER macro Date: Thu, 24 Mar 2022 08:14:53 -0300 Message-Id: <20220324111455.389344-4-cascardo@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220324111455.389344-1-cascardo@canonical.com> References: <20220324111455.389344-1-cascardo@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Yunsheng Lin Both SKB_FRAG_PAGE_ORDER are defined to the same value in net/core/sock.c and drivers/vhost/net.c. Move the SKB_FRAG_PAGE_ORDER definition to net/core/sock.h, as both net/core/sock.c and drivers/vhost/net.c include it, and it seems a reasonable file to put the macro. Signed-off-by: Yunsheng Lin Acked-by: Jason Wang Signed-off-by: David S. Miller (cherry picked from commit 723783d077e39c256a1fafebbd97cbb14207c28f) CVE-2022-27666 Signed-off-by: Thadeu Lima de Souza Cascardo --- drivers/vhost/net.c | 2 -- include/net/sock.h | 1 + net/core/sock.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index bff77e92a19e..dfe239f09514 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -652,8 +652,6 @@ static bool tx_can_batch(struct vhost_virtqueue *vq, size_t total_len) !vhost_vq_avail_empty(vq->dev, vq); } -#define SKB_FRAG_PAGE_ORDER get_order(32768) - static bool vhost_net_page_frag_refill(struct vhost_net *net, unsigned int sz, struct page_frag *pfrag, gfp_t gfp) { diff --git a/include/net/sock.h b/include/net/sock.h index 8bb190a43013..cef86bc2ec63 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2709,6 +2709,7 @@ extern int sysctl_optmem_max; extern __u32 sysctl_wmem_default; extern __u32 sysctl_rmem_default; +#define SKB_FRAG_PAGE_ORDER get_order(32768) DECLARE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key); static inline int sk_get_wmem0(const struct sock *sk, const struct proto *proto) diff --git a/net/core/sock.c b/net/core/sock.c index ec1e201c4e63..0fbe739cac0a 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -2488,7 +2488,6 @@ static void sk_leave_memory_pressure(struct sock *sk) } } -#define SKB_FRAG_PAGE_ORDER get_order(32768) DEFINE_STATIC_KEY_FALSE(net_high_order_alloc_disable_key); /**