{"id":1839936,"url":"http://patchwork.ozlabs.org/api/patches/1839936/?format=json","web_url":"http://patchwork.ozlabs.org/project/netfilter-devel/patch/20230926200505.2804266-4-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-4-jrife@google.com>","list_archive_url":null,"date":"2023-09-26T20:05:05","name":"[net,v6,3/3] net: prevent address rewrite in kernel_bind()","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":false,"hash":"f923be62e68c62290c483b5bf6ff8ca147e4e09f","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-4-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/1839936/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1839936/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=fHvz/oXf;\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 4Rw9hf4v41z1yp0\n\tfor ; Wed, 27 Sep 2023 06:05:22 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n id S235816AbjIZUF0 (ORCPT );\n Tue, 26 Sep 2023 16:05:26 -0400","from lindbergh.monkeyblade.net ([23.128.96.19]:52274 \"EHLO\n lindbergh.monkeyblade.net\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n with ESMTP id S235817AbjIZUFZ (ORCPT\n );\n Tue, 26 Sep 2023 16:05:25 -0400","from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com\n [IPv6:2607:f8b0:4864:20::1149])\n by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61BC413A\n for ;\n Tue, 26 Sep 2023 13:05:17 -0700 (PDT)","by mail-yw1-x1149.google.com with SMTP id\n 00721157ae682-59c0327b75dso179927777b3.2\n for ;\n Tue, 26 Sep 2023 13:05:17 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=google.com; s=20230601; t=1695758716; x=1696363516;\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=iUWT+ccHYSlqR7Gmrnq8A76xPWnK8wJVTcz3EkgFwkk=;\n b=fHvz/oXfN/BEP2dph9JC3zX7RplJK25pHOYQ4k6IYY2hH90LJ9R8h6X9CBSdVPWzOA\n zZ/uFcKpr7u4eQsd5O2ZSK+xcQXrOywBXajCGjcm0whNsAFfSsrd738LczlzCSllqloF\n pEzhSw4I1X44/guUCDwGqfzt9QuibRzEndhzaLrYP7lK6AG64NG8oc2alRg7CkTJ7JOZ\n bOx/0fu4TVsqxt+gD/reQgOiiGqTXzlYIgCQRXfciGybYOOS7c1U9Q1SAtvzHOyiSP4G\n taSxv0/UENApCkCQ7xsaAMjZBN1Pgu/eEuwoYJpS59T8gWm6HkncOggfOM07dVhLywpq\n HUEA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1695758716; x=1696363516;\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=iUWT+ccHYSlqR7Gmrnq8A76xPWnK8wJVTcz3EkgFwkk=;\n b=MvbtCES3va5i/6x0ZZ+F4sATRbDkAf2/AeyfmkUYm1nWLX1I0hAUOsyyAqALdB/8+7\n huSdgzw9rnJx7g4tuCT5Lj8N63C+Cl6cwAu6tFGxA86nSxNyy5Zw+XyBZd/ChAqrPDmz\n tT00vNfX0pad85film0ZPzopxblm6cz5jJKenBN4MnEo7CGzVwCVLYgGAdP1QLeiYevH\n yriW0Bj3WRHvrUdWaeUg7sxWW3lNQmEJDo+fwz8UsxkDLZn02RPPtgHyiuY/i7Op9nIv\n LBw71ZQJU/QULZ1t5C0usdAMFVWFE8A5AbHU8VKLMl2aP4SecKh9sdPh3ER8BBOM9EDs\n b7MQ==","X-Gm-Message-State":"AOJu0YzDx3OgmI/tHNoRpv43xelbyLZJotX1tyKpszqFwte40Xo0K+zw\n 26US547qMkbq5UJ23R9jzOecglENhw==","X-Google-Smtp-Source":"\n AGHT+IEUd45Rw2MBKHocGo/lYiGWT9CIksAVWd6cnwx9BMyxx8zuAa0FUl0Vs9Eq31nY+vAcjI1OSk/2lQ==","X-Received":"from jrife.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:9f])\n (user=jrife job=sendgmr) by 2002:a81:af60:0:b0:59b:ca80:919a with SMTP id\n x32-20020a81af60000000b0059bca80919amr428ywj.0.1695758716434; Tue, 26 Sep\n 2023 13:05:16 -0700 (PDT)","Date":"Tue, 26 Sep 2023 15:05:05 -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-4-jrife@google.com>","Subject":"[PATCH net v6 3/3] net: prevent address rewrite in kernel_bind()","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=unavailable 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":"Similar to the change in commit 0bdf399342c5(\"net: Avoid address\noverwrite in kernel_connect\"), BPF hooks run on bind may rewrite the\naddress passed to kernel_bind(). This change\n\n1) Makes a copy of the bind address in kernel_bind() to insulate\n callers.\n2) Replaces direct calls to sock->ops->bind() in net with kernel_bind()\n\nLink: https://lore.kernel.org/netdev/20230912013332.2048422-1-jrife@google.com/\nFixes: 4fbac77d2d09 (\"bpf: Hooks for sys_bind\")\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 net/rds/tcp_listen.c | 2 +-\n net/socket.c | 7 ++++++-\n 4 files changed, 10 insertions(+), 5 deletions(-)","diff":"diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c\nindex 6e4ed1e11a3b7..4174076c66fa7 100644\n--- a/net/netfilter/ipvs/ip_vs_sync.c\n+++ b/net/netfilter/ipvs/ip_vs_sync.c\n@@ -1439,7 +1439,7 @@ static int bind_mcastif_addr(struct socket *sock, struct net_device *dev)\n \tsin.sin_addr.s_addr = addr;\n \tsin.sin_port = 0;\n \n-\treturn sock->ops->bind(sock, (struct sockaddr*)&sin, sizeof(sin));\n+\treturn kernel_bind(sock, (struct sockaddr *)&sin, sizeof(sin));\n }\n \n static void get_mcast_sockaddr(union ipvs_sockaddr *sa, int *salen,\n@@ -1546,7 +1546,7 @@ static int make_receive_sock(struct netns_ipvs *ipvs, int id,\n \n \tget_mcast_sockaddr(&mcast_addr, &salen, &ipvs->bcfg, id);\n \tsock->sk->sk_bound_dev_if = dev->ifindex;\n-\tresult = sock->ops->bind(sock, (struct sockaddr *)&mcast_addr, salen);\n+\tresult = kernel_bind(sock, (struct sockaddr *)&mcast_addr, salen);\n \tif (result < 0) {\n \t\tpr_err(\"Error binding to the multicast addr\\n\");\n \t\tgoto error;\ndiff --git a/net/rds/tcp_connect.c b/net/rds/tcp_connect.c\nindex d788c6d28986f..a0046e99d6df7 100644\n--- a/net/rds/tcp_connect.c\n+++ b/net/rds/tcp_connect.c\n@@ -145,7 +145,7 @@ int rds_tcp_conn_path_connect(struct rds_conn_path *cp)\n \t\taddrlen = sizeof(sin);\n \t}\n \n-\tret = sock->ops->bind(sock, addr, addrlen);\n+\tret = kernel_bind(sock, addr, addrlen);\n \tif (ret) {\n \t\trdsdebug(\"bind failed with %d at address %pI6c\\n\",\n \t\t\t ret, &conn->c_laddr);\ndiff --git a/net/rds/tcp_listen.c b/net/rds/tcp_listen.c\nindex 014fa24418c12..53b3535a1e4a8 100644\n--- a/net/rds/tcp_listen.c\n+++ b/net/rds/tcp_listen.c\n@@ -306,7 +306,7 @@ struct socket *rds_tcp_listen_init(struct net *net, bool isv6)\n \t\taddr_len = sizeof(*sin);\n \t}\n \n-\tret = sock->ops->bind(sock, (struct sockaddr *)&ss, addr_len);\n+\tret = kernel_bind(sock, (struct sockaddr *)&ss, addr_len);\n \tif (ret < 0) {\n \t\trdsdebug(\"could not bind %s listener socket: %d\\n\",\n \t\t\t isv6 ? \"IPv6\" : \"IPv4\", ret);\ndiff --git a/net/socket.c b/net/socket.c\nindex 107a257a75186..3408bd6bb1e5a 100644\n--- a/net/socket.c\n+++ b/net/socket.c\n@@ -3518,7 +3518,12 @@ static long compat_sock_ioctl(struct file *file, unsigned int cmd,\n \n int kernel_bind(struct socket *sock, struct sockaddr *addr, int addrlen)\n {\n-\treturn READ_ONCE(sock->ops)->bind(sock, addr, addrlen);\n+\tstruct sockaddr_storage address;\n+\n+\tmemcpy(&address, addr, addrlen);\n+\n+\treturn READ_ONCE(sock->ops)->bind(sock, (struct sockaddr *)&address,\n+\t\t\t\t\t addrlen);\n }\n EXPORT_SYMBOL(kernel_bind);\n \n","prefixes":["net","v6","3/3"]}