{"id":1839934,"url":"http://patchwork.ozlabs.org/api/patches/1839934/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20230926200505.2804266-2-jrife@google.com/","project":{"id":26,"url":"http://patchwork.ozlabs.org/api/projects/26/?format=json","name":"Netfilter Development","link_name":"netfilter-devel","list_id":"netfilter-devel.vger.kernel.org","list_email":"netfilter-devel@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20230926200505.2804266-2-jrife@google.com>","list_archive_url":null,"date":"2023-09-26T20:05:03","name":"[net,v6,1/3] net: replace calls to sock->ops->connect() with kernel_connect()","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":false,"hash":"198a49a6271e8a0d3842bc015129dd50c9c222ed","submitter":{"id":87261,"url":"http://patchwork.ozlabs.org/api/people/87261/?format=json","name":"Jordan Rife","email":"jrife@google.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20230926200505.2804266-2-jrife@google.com/mbox/","series":[{"id":374999,"url":"http://patchwork.ozlabs.org/api/series/374999/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/list/?series=374999","date":"2023-09-26T20:05:02","name":"Insulate Kernel Space From SOCK_ADDR Hooks","version":6,"mbox":"http://patchwork.ozlabs.org/series/374999/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1839934/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1839934/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256\n header.s=20230601 header.b=QdxdKR01;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2620:137:e000::1:20; helo=out1.vger.email;\n envelope-from=netfilter-devel-owner@vger.kernel.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20])\n\tby legolas.ozlabs.org (Postfix) with ESMTP id 4Rw9hb1Sfnz1yp0\n\tfor ; Wed, 27 Sep 2023 06:05:19 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S235811AbjIZUFW (ORCPT );\n Tue, 26 Sep 2023 16:05:22 -0400","from lindbergh.monkeyblade.net ([23.128.96.19]:40124 \"EHLO\n lindbergh.monkeyblade.net\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n with ESMTP id S235808AbjIZUFV (ORCPT\n );\n Tue, 26 Sep 2023 16:05:21 -0400","from mail-io1-xd49.google.com (mail-io1-xd49.google.com\n [IPv6:2607:f8b0:4864:20::d49])\n by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67608180\n for ;\n Tue, 26 Sep 2023 13:05:13 -0700 (PDT)","by mail-io1-xd49.google.com with SMTP id\n ca18e2360f4ac-790d3e93a25so1240220639f.0\n for ;\n Tue, 26 Sep 2023 13:05:13 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=google.com; s=20230601; t=1695758712; x=1696363512;\n darn=vger.kernel.org;\n h=cc:to:from:subject:message-id:references:mime-version:in-reply-to\n :date:from:to:cc:subject:date:message-id:reply-to;\n bh=3bPJjIsPmHmwi+Eu0+GyNZUXrMn22SrOLV+oVGGBzwU=;\n b=QdxdKR018VDb7P3I3YlQobzqnoLNRUnnCyIuGMfXhO9cqkO5AeiTcdqria2tHKPDqw\n wo2i8J7WCXOfI8amssYt0W3+RqJXhJ27F8F6YRyBmXzo+o5Tcqao8vUjxqMoJvjYzjnv\n lLX4BP13ETlo2B5wYSw+8IX5XvhhkPZBXnx/nAzM35gjVDFiCq0SWSspZDiifpEpPlxa\n cCfnM7yNy67zdgarNHxXAmptNAZm42yEhLU5QVXf1DNqnaKk8EBQqYedhkiEBJyFtvzH\n QgB25oVoXgBNvKH7Syx7latiVYRf7ARFpU/eqy6j21L/5jxx+q68OK265WvrHn54JYpl\n F2pA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1695758712; x=1696363512;\n h=cc:to:from:subject:message-id:references:mime-version:in-reply-to\n :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;\n bh=3bPJjIsPmHmwi+Eu0+GyNZUXrMn22SrOLV+oVGGBzwU=;\n b=xTuoyRA5dcviqeFGd/9LL2O3/+yvcZrCgiueLL3faxlKVPkXC7wJUg+WC2sZYiCXIH\n /8P+08Y5+O7RhVDlu4tEgognoiFfIrdR5eY6Gl412Ekb+aQx03RvmdId96xBK/56nvZP\n X/niGv6QsZEcwtZksbp0bwciRbmzgL5Z3pbbAjSyhLtMaoOf7lwH556A1CIAMCEHaHJO\n Jkp3M4HXGOaA1tjxc+ZxyHmqFKLlLR3vWZRGdWexwGjpUJ3aM6uFCSSKv2HxiRDtmzf2\n Z/zY3Uu/07/LyivbVdMvcstjDeHn+dWZO9Tvp2vWKhZjRklxBbOspjRbziheV7PXeiYj\n TGnA==","X-Gm-Message-State":"AOJu0Yxic9/mzcdTC27LFhVz2kHIjxCiUwX/t+lHI5Zp3LJjs+fzPKXC\n gaN+hN8CK+BT4Ho+/aeOnixi+67d+A==","X-Google-Smtp-Source":"\n AGHT+IEzIkpre/+4lLTj1Y3n0rLDVitTTn2Hh0vxS4CExp5VXmGekw+m4PiW3pEg4WIhcV6yD7AarCtsHA==","X-Received":"from jrife.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:9f])\n (user=jrife job=sendgmr) by 2002:a05:6638:3a0c:b0:43c:e73c:74e7 with SMTP id\n cn12-20020a0566383a0c00b0043ce73c74e7mr39988jab.3.1695758712659; Tue, 26 Sep\n 2023 13:05:12 -0700 (PDT)","Date":"Tue, 26 Sep 2023 15:05:03 -0500","In-Reply-To":"<20230926200505.2804266-1-jrife@google.com>","Mime-Version":"1.0","References":"<20230926200505.2804266-1-jrife@google.com>","X-Mailer":"git-send-email 2.42.0.515.g380fc7ccd1-goog","Message-ID":"<20230926200505.2804266-2-jrife@google.com>","Subject":"[PATCH net v6 1/3] net: replace calls to sock->ops->connect() with\n kernel_connect()","From":"Jordan Rife ","To":"davem@davemloft.net, edumazet@google.com, kuba@kernel.org,\n pabeni@redhat.com, willemdebruijn.kernel@gmail.com,\n netdev@vger.kernel.org","Cc":"dborkman@kernel.org, horms@verge.net.au, pablo@netfilter.org,\n kadlec@netfilter.org, fw@strlen.de, santosh.shilimkar@oracle.com,\n ast@kernel.org, rdna@fb.com, linux-rdma@vger.kernel.org,\n rds-devel@oss.oracle.com, coreteam@netfilter.org,\n netfilter-devel@vger.kernel.org, ja@ssi.bg,\n lvs-devel@vger.kernel.org, kafai@fb.com, daniel@iogearbox.net,\n daan.j.demeyer@gmail.com, Jordan Rife ,\n stable@vger.kernel.org, Willem de Bruijn ","Content-Type":"text/plain; charset=\"UTF-8\"","X-Spam-Status":"No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL\n autolearn=ham autolearn_force=no version=3.4.6","X-Spam-Checker-Version":"SpamAssassin 3.4.6 (2021-04-09) on\n lindbergh.monkeyblade.net","Precedence":"bulk","List-ID":"","X-Mailing-List":"netfilter-devel@vger.kernel.org"},"content":"commit 0bdf399342c5 (\"net: Avoid address overwrite in kernel_connect\")\nensured that kernel_connect() will not overwrite the address parameter\nin cases where BPF connect hooks perform an address rewrite. This change\nreplaces direct calls to sock->ops->connect() in net with kernel_connect()\nto make these call safe.\n\nLink: https://lore.kernel.org/netdev/20230912013332.2048422-1-jrife@google.com/\nFixes: d74bad4e74ee (\"bpf: Hooks for sys_connect\")\nCc: stable@vger.kernel.org\nReviewed-by: Willem de Bruijn \nSigned-off-by: Jordan Rife \n---\n net/netfilter/ipvs/ip_vs_sync.c | 4 ++--\n net/rds/tcp_connect.c | 2 +-\n 2 files changed, 3 insertions(+), 3 deletions(-)","diff":"diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c\nindex da5af28ff57b5..6e4ed1e11a3b7 100644\n--- a/net/netfilter/ipvs/ip_vs_sync.c\n+++ b/net/netfilter/ipvs/ip_vs_sync.c\n@@ -1505,8 +1505,8 @@ static int make_send_sock(struct netns_ipvs *ipvs, int id,\n \t}\n \n \tget_mcast_sockaddr(&mcast_addr, &salen, &ipvs->mcfg, id);\n-\tresult = sock->ops->connect(sock, (struct sockaddr *) &mcast_addr,\n-\t\t\t\t salen, 0);\n+\tresult = kernel_connect(sock, (struct sockaddr *)&mcast_addr,\n+\t\t\t\tsalen, 0);\n \tif (result < 0) {\n \t\tpr_err(\"Error connecting to the multicast addr\\n\");\n \t\tgoto error;\ndiff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c\nindex f0c477c5d1db4..d788c6d28986f 100644\n--- a/net/rds/tcp_connect.c\n+++ b/net/rds/tcp_connect.c\n@@ -173,7 +173,7 @@ int rds_tcp_conn_path_connect(struct rds_conn_path *cp)\n \t * own the socket\n \t */\n \trds_tcp_set_callbacks(sock, cp);\n-\tret = sock->ops->connect(sock, addr, addrlen, O_NONBLOCK);\n+\tret = kernel_connect(sock, addr, addrlen, O_NONBLOCK);\n \n \trdsdebug(\"connect to address %pI6c returned %d\\n\", &conn->c_faddr, ret);\n \tif (ret == -EINPROGRESS)\n","prefixes":["net","v6","1/3"]}