From patchwork Thu Jan 11 02:03:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10156631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 88D07605BA for ; Thu, 11 Jan 2018 02:14:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76C0F2874B for ; Thu, 11 Jan 2018 02:14:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A63E2874E; Thu, 11 Jan 2018 02:14:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id 55EB32874B for ; Thu, 11 Jan 2018 02:14:28 +0000 (UTC) Received: (qmail 30152 invoked by uid 550); 11 Jan 2018 02:10:15 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 29783 invoked from network); 11 Jan 2018 02:10:01 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=GYMFju1GmggA97KjERN9iZ2gpFg5cO1xOIbpQKD795Y=; b=Ht6TJwgeO7qs7Bx21aQ6Dy1OFKGRoPrNSq9MxAjyqzdU9OtCVZbqwgXuw+JgdnHEyl PabQpMy1SSp2kGBm0/4GBjlQIvxhXhmcs68JylUvtoACR2xcJExFtF+oMrRGlAwvjx2h bBJMxW0cA4RHPtSpt2zpLO8sy6gSoeNpuQpE4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=GYMFju1GmggA97KjERN9iZ2gpFg5cO1xOIbpQKD795Y=; b=o8558sJE6rP1sB14ep1CYhVR8YjFVVmJwcDbsW2y2mABoKF2WUzXuPu0bGK2HOSQgz xV+JHQL0ITB4lhTNy8kdfmnb5UCU2Kun2iaVpMRcfzLn899ahs59HjstBcMvs47yy58Z BbnPN74djSTnTyPexaAsbb3Og/vxL4nHQPQTJGtfi4bTcaa3I8qMRizgiHnzWbcSl/Ee hxybPZCD9Fggs/h631mswakzNRTwh1fjcGWPK9tnwnbaVtiNWsiWBViIxCP1K737/8gQ hvnuHNHj02vEixe4FN8glEXOc6QEbwFU+adq2IyYDEo4oOd6T81S0bwEEU5D6Ok++m1F sscg== X-Gm-Message-State: AKGB3mIT8Rba1yxSywPYS/aofYE5LaNO9SuNMsSDr0qz+v3gqc4T047m Er05EDbHZgM7iKyOetciuNL/+g== X-Google-Smtp-Source: ACJfBouVoUG4lEsVZoevwBQpZpjeHK7lF/JreZC0882Q3ogFwD5HMeOktNrqY0f5epMrmRPnRuu8Lw== X-Received: by 10.101.65.203 with SMTP id b11mr16441101pgq.44.1515636589598; Wed, 10 Jan 2018 18:09:49 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , "David S. Miller" , Eric Dumazet , Paolo Abeni , David Howells , netdev@vger.kernel.org, Linus Torvalds , David Windsor , Alexander Viro , Andrew Morton , Andy Lutomirski , Christoph Hellwig , Christoph Lameter , Laura Abbott , Mark Rutland , "Martin K. Petersen" , Paolo Bonzini , Christian Borntraeger , Christoffer Dall , Dave Kleikamp , Jan Kara , Luis de Bethencourt , Marc Zyngier , Rik van Riel , Matthew Garrett , linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Date: Wed, 10 Jan 2018 18:03:00 -0800 Message-Id: <1515636190-24061-29-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515636190-24061-1-git-send-email-keescook@chromium.org> References: <1515636190-24061-1-git-send-email-keescook@chromium.org> Subject: [kernel-hardening] [PATCH 28/38] net: Restrict unwhitelisted proto caches to size 0 X-Virus-Scanned: ClamAV using ClamSMTP Now that protocols have been annotated (the copy of icsk_ca_ops->name is of an ops field from outside the slab cache): $ git grep 'copy_.*_user.*sk.*->' caif/caif_socket.c: copy_from_user(&cf_sk->conn_req.param.data, ov, ol)) { ipv4/raw.c: if (copy_from_user(&raw_sk(sk)->filter, optval, optlen)) ipv4/raw.c: copy_to_user(optval, &raw_sk(sk)->filter, len)) ipv4/tcp.c: if (copy_to_user(optval, icsk->icsk_ca_ops->name, len)) ipv4/tcp.c: if (copy_to_user(optval, icsk->icsk_ulp_ops->name, len)) ipv6/raw.c: if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen)) ipv6/raw.c: if (copy_to_user(optval, &raw6_sk(sk)->filter, len)) sctp/socket.c: if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen)) sctp/socket.c: if (copy_to_user(optval, &sctp_sk(sk)->subscribe, len)) sctp/socket.c: if (copy_to_user(optval, &sctp_sk(sk)->initmsg, len)) we can switch the default proto usercopy region to size 0. Any protocols needing to add whitelisted regions must annotate the fields with the useroffset and usersize fields of struct proto. This patch is modified from Brad Spengler/PaX Team's PAX_USERCOPY whitelisting code in the last public patch of grsecurity/PaX based on my understanding of the code. Changes or omissions from the original code are mine and don't reflect the original grsecurity/PaX code. Cc: "David S. Miller" Cc: Eric Dumazet Cc: Paolo Abeni Cc: David Howells Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook --- net/core/sock.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 261e6dbf0259..f39206b41b32 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3154,9 +3154,7 @@ int proto_register(struct proto *prot, int alloc_slab) prot->slab = kmem_cache_create_usercopy(prot->name, prot->obj_size, 0, SLAB_HWCACHE_ALIGN | prot->slab_flags, - prot->usersize ? prot->useroffset : 0, - prot->usersize ? prot->usersize - : prot->obj_size, + prot->useroffset, prot->usersize, NULL); if (prot->slab == NULL) {