From patchwork Tue Jan 9 20:55:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10153457 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 F0AA660223 for ; Tue, 9 Jan 2018 21:06:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5266205F7 for ; Tue, 9 Jan 2018 21:06:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D84562434C; Tue, 9 Jan 2018 21:06:03 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CBEB205F6 for ; Tue, 9 Jan 2018 21:06:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759220AbeAIVEQ (ORCPT ); Tue, 9 Jan 2018 16:04:16 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:42868 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759212AbeAIU5J (ORCPT ); Tue, 9 Jan 2018 15:57:09 -0500 Received: by mail-pg0-f65.google.com with SMTP id q67so8812266pga.9 for ; Tue, 09 Jan 2018 12:57:09 -0800 (PST) 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=QDHc4LSQPic9NW8CRyeL/WB8AYGM/YY3zK0IoUl5BI/sgghhDyfKGNp2cD0uI7+RSM RhuZMhbaLmRVGFcCXdrxRsqUX+dwarGfCQFNwu4OmPgX/8h8h+GEp0Fdq//pxTnAIoBv CX5HSPYWlwN1RQGABrkrXS9tthIn4tMJ+dfZU= 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=T8ujXQiNMWxNN2IhouTU15DdftrO+5iTMQAp4Mlxdh9WM7IOMFEg7YnvAJBqDRizR3 vQFiUMVE08VkD8ITmxqfaReuNmjyzMKi7RS70IMZDxpITy8Iq4c3RoEOYzEh/33F5fHK 2C3DtyVgFrQY4kS2jXis54zglVZXozr5DmoXFG62XwDtIV9aKWf0Ai93kUxzIZGjLu4N bvYr7/djbjSvkX3tGo9kmPWSojdkCY/wU3ZCptBAe2l9qWnWSumvTmaXFEJ7a7pUflvw RCcy/OuXAYVFVotZhfR3aiiPKOBXwXgz39YKCUsABSH99Mur9rBFXm2q+2+hoTxTKNzq PNDA== X-Gm-Message-State: AKGB3mIyQKiLx+odaitBEbS/I9KKBP9FyRyYFwxbHwnyIz2HXuBopQ+x yP4RTyATe1IlNjR98+9mBNHwfw== X-Google-Smtp-Source: ACJfBosGy0fSFNNOudUppXc2BlzonSUIdL6vPIbG/qtLB6WcB/OSPEkLRscNVqS1Qgmqd5EWtImARA== X-Received: by 10.159.196.141 with SMTP id c13mr16397447plo.15.1515531429327; Tue, 09 Jan 2018 12:57:09 -0800 (PST) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id s184sm29901258pfb.9.2018.01.09.12.57.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 12:57:05 -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 Subject: [PATCH 25/36] net: Restrict unwhitelisted proto caches to size 0 Date: Tue, 9 Jan 2018 12:55:54 -0800 Message-Id: <1515531365-37423-26-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515531365-37423-1-git-send-email-keescook@chromium.org> References: <1515531365-37423-1-git-send-email-keescook@chromium.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org 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) {