From patchwork Sat Dec 12 15:31:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Stewart X-Patchwork-Id: 343202 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2080FC433FE for ; Sat, 12 Dec 2020 15:32:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD762222B3 for ; Sat, 12 Dec 2020 15:32:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439272AbgLLPcf (ORCPT ); Sat, 12 Dec 2020 10:32:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728704AbgLLPc3 (ORCPT ); Sat, 12 Dec 2020 10:32:29 -0500 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0535C0613D6 for ; Sat, 12 Dec 2020 07:31:48 -0800 (PST) Received: by mail-ej1-x643.google.com with SMTP id g20so16536831ejb.1 for ; Sat, 12 Dec 2020 07:31:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nametag.social; s=google; h=mime-version:from:date:message-id:subject:to; bh=AcrMK4/n37JI/DMV0HjZEiX27NSebyROaT8OWAvMNBw=; b=vtSV1iHT0efi46wPfoJpuFg1nK2bdC/VzZA6MRjeXr1xW4qXgjpUGnl/2DfzffR/6/ 2RhvKNb8QtR1MQiK1sL0gmZqgPriuym2CnvE/h1lFPPG8zMZBiTcOQnmNwaGq2+42B97 /sZmH6KbGt5e+O+Xe/2iNo4yC4+jTEEUR/+CHdTVe+UzwPGha3xnIieQKElNxosqMSg5 feiWxe713A0J2j5iiz6vS6hCjZ+yLdoi1SDMZV4jP2trxmdxtC9qqWdATGs7mAEZXtYx aPqbSA8VtDjqFsdQj/hezVvJbpVenDkJjT2ZZM2ntHE1SPYMDsJaEm5/vg2vBge2y4RP +Y3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=AcrMK4/n37JI/DMV0HjZEiX27NSebyROaT8OWAvMNBw=; b=auPtDuLxlH+9rNE9owlpLeKHuHhsZlOXY4EXf3MDKwil6J1LZPbSIXTdqTu86QCAab rPGmd27lnVHRQCzgLZcgvbwIVyJ3v7rw3epW0lsn/+ZEcfj9uGBKDva9b0/9FDxHZEfm cDTy2bMS+FHUwM8Pes29GWjXYRpCQultZ7ivt85VaBRWS/xT/gU3gbDGLTabuCoudwVd WNKf7F7Qw8m5B8X+l44las9Iya8hl4sqoRNehExSjoQz3eyaZU0ojYhIEmsUTpYOcbOh pfDR6pnr4DJ/a4tovlMWzV6Vir4Cb27/LiFaZjwOz42LEky4mnGsJ2WHe7UvgOLOrLPZ hljg== X-Gm-Message-State: AOAM53309NmSdP2/WRP5eFYxnsHSurAzTzHO8SIOcGhz+tqOtWhSUWZ+ Kq4mDDhRqAKZ8aPZV2Wpe3UlBFEoZ2C5ZqWA9PBXgA== X-Google-Smtp-Source: ABdhPJzdlRnKPfltvgEaKD8UIUmf7/DVijDULyHyNuR0R44sfbTuQ/Mi4ZzCT2fxkH8xmbbhZjQAC8DNvtrD5zyXVEg= X-Received: by 2002:a17:906:40d3:: with SMTP id a19mr15228361ejk.98.1607787107557; Sat, 12 Dec 2020 07:31:47 -0800 (PST) MIME-Version: 1.0 From: Victor Stewart Date: Sat, 12 Dec 2020 15:31:36 +0000 Message-ID: Subject: [PATCH 1/3] add PROTO_CMSG_DATA_ONLY to __sys_sendmsg_sock To: io-uring , Soheil Hassas Yeganeh , netdev , Stefan Metzmacher Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org add PROTO_CMSG_DATA_ONLY whitelisting to __sys_sendmsg_sock Signed-off by: Victor Stewart --- net/socket.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) } diff --git a/net/socket.c b/net/socket.c index 6e6cccc2104f..6995835d6355 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2416,9 +2416,11 @@ static int ___sys_sendmsg(struct socket *sock, struct user_msghdr __user *msg, long __sys_sendmsg_sock(struct socket *sock, struct msghdr *msg, unsigned int flags) { - /* disallow ancillary data requests from this path */ - if (msg->msg_control || msg->msg_controllen) - return -EINVAL; + if (msg->msg_control || msg->msg_controllen) { + /* disallow ancillary data reqs unless cmsg is plain data */ + if (!(sock->ops->flags & PROTO_CMSG_DATA_ONLY)) + return -EINVAL; + } return ____sys_sendmsg(sock, msg, flags, NULL, 0); From patchwork Sat Dec 12 15:31:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Victor Stewart X-Patchwork-Id: 343201 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5423DC433FE for ; Sat, 12 Dec 2020 15:33:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A68D222BB for ; Sat, 12 Dec 2020 15:33:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439279AbgLLPd1 (ORCPT ); Sat, 12 Dec 2020 10:33:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439273AbgLLPdJ (ORCPT ); Sat, 12 Dec 2020 10:33:09 -0500 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26C40C0617A6 for ; Sat, 12 Dec 2020 07:31:56 -0800 (PST) Received: by mail-ej1-x642.google.com with SMTP id n26so16486631eju.6 for ; Sat, 12 Dec 2020 07:31:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nametag.social; s=google; h=mime-version:from:date:message-id:subject:to; bh=iHyYxUrb0BRO8DXNBu/BXjBebWrkB+LbsHZA9LoJK48=; b=D6XEAHIug8iYe4lRCjNGZjjOvk6MePTQ6RoQULtDXRBNZwajTKxmMfRFwnMzYKUxK4 ulPOwf2Nr81qLhJnmfr7ypCWG9aMiqInGCfSFHyD34nBOuod/PImZy2qPxbicQoBJwVc wzMdSFw2XBVbT/KCg0q9wVKdrOCGAHnqhz/+jY9lX4YAOepbAhdffp+LE1N5Br4s4DmM ixAhWH3uhySEbvee+l014XvZ8BalNN00JdepBDsYhS9KroIopYcvJb4b5z3zQbJIL4bE J/ffnsSXt0YLfDcqaHpMFrIk/XqwPnXa00uvYwSx2BokXWOuolLAJHUL0rsF9WIX5EsC esyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=iHyYxUrb0BRO8DXNBu/BXjBebWrkB+LbsHZA9LoJK48=; b=N8wEX68PuTsjQTKf7hcpQ6L43c2cqlA3Ug87A3iLIHi9mfQqwwZCrm9+FgXmSwXitN RUHGipMvQGDlURKXQ/DyUTGczx2kP3WmRUUL/EyxBY2wJHZ01e3vd+ZXt11iPDXpkVv7 YViVSn8ZbP7DPVG/qM20jEyObCnJzj3K78yKWtbOEonZHHVQMzY6abhn7BnVV2I03X3M QY5tRxa1eG/Y/I2qiD5boGBo8K/9s0aIW1fy1Iaw/2eR8C3Qy9An7rTQTLdbEqcrRdOV imnxnJMfHY0lm3KL2/T83CETSzV0jUVFuxPKjM3YGMn8a6JJ3UcflxUstOL1Y6MCXi6H 8jLw== X-Gm-Message-State: AOAM530OFS7F3i/IvXh9ISxyneuF2vHckxw/JxNXB900QKMd29Ccd1jX 48zRBoPZkQeFm7UCBsdkugeLbHQEOJ4jZa31BYrnDdjqrRy3bJ5d X-Google-Smtp-Source: ABdhPJxRCNCXTCUEJyeSKL2oE5mX1UC3MXQoKs6odAnB/5GGCKNF7/QGajbtUQ5I5ZEDYmjgteL1Vh770O4reEEjZHw= X-Received: by 2002:a17:906:4994:: with SMTP id p20mr15440540eju.391.1607787114894; Sat, 12 Dec 2020 07:31:54 -0800 (PST) MIME-Version: 1.0 From: Victor Stewart Date: Sat, 12 Dec 2020 15:31:44 +0000 Message-ID: Subject: [PATCH 3/3] add PROTO_CMSG_DATA_ONLY to inet6_dgram_ops To: io-uring , netdev , Soheil Hassas Yeganeh , Stefan Metzmacher Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org add PROTO_CMSG_DATA_ONLY to inet6_dgram_ops Signed-off by: Victor Stewart --- net/ipv6/af_inet6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index e648fbebb167..560f45009d06 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -695,6 +695,7 @@ const struct proto_ops inet6_stream_ops = { const struct proto_ops inet6_dgram_ops = { .family = PF_INET6, + .flags = PROTO_CMSG_DATA_ONLY, .owner = THIS_MODULE, .release = inet6_release, .bind = inet6_bind,