From patchwork Wed Sep 20 20:45:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9962449 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 5D3DF60208 for ; Wed, 20 Sep 2017 20:48:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50C8729226 for ; Wed, 20 Sep 2017 20:48:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4547329229; Wed, 20 Sep 2017 20:48:40 +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=-2.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, URIBL_BLACK 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 59F1429226 for ; Wed, 20 Sep 2017 20:48:39 +0000 (UTC) Received: (qmail 3988 invoked by uid 550); 20 Sep 2017 20:46:31 -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 3743 invoked from network); 20 Sep 2017 20:46:25 -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=3rcTq9qKe3syswrU9FV9vxWUfCoZoHovIBXXZeEnCUU=; b=Gwe6hX+2V6YzhjyyG3Ul7QBvUBTlls0iOGWH94n1WTSGdugtZkyg2/5qAZnZhYLXMi DEQrRs0Rj6kOq3ZOsG/BO4arAnJojrbBSkQrsYeqMjP5GqDDeCtgWG9hhDCcHOkS1vO5 OOg2GQRzw5UgnhSTj1aBHYfEHZJvwDJ3/12zM= 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=3rcTq9qKe3syswrU9FV9vxWUfCoZoHovIBXXZeEnCUU=; b=cuczOA/C9GKMctxA4uYBTCW7h3dUzzExlVnXMPWll0YMm7MhzvHjtIFXcZc6ahndx1 RiyOht+ZGcv7qqw3eqGbTRJGoLywo0j78T1mm4lHCMivObqxmbwYHLIn3KjBz7KL/VtS 4klONu01eSZ3HpnDNK03Wgq/nm/4H3WpDR6rw3FmxacEVgxJSj3oFyPLgoOmcsNPsA4T CsquohIl+YeSVr1OJdWMlJC+GPMLrsbcqSQ5CramrWe4HRuWK9IpHrgLt8kYGEKffYla 3ih5yjRIi6XXhm2Iu1rWbVww9qQXHbQ5NmTgSG+ge4p7zAH1NNSf9eb32UBvcYGEaj43 kiYA== X-Gm-Message-State: AHPjjUiY51SVMo6v2uvAaJ8FxE3jUBMWHw0RzyyXVsaifDOlOQBuumnK E6SjARbXNdB9kGq8K/ej4xR1hw== X-Google-Smtp-Source: AOwi7QBeF4XE3RC/jm1ungl235aGF2O8qubaS7Hhsvw6JXmDKu0o1gUJa6HnDsW7w11pArmSTLNEHQ== X-Received: by 10.99.3.4 with SMTP id 4mr3448567pgd.203.1505940374030; Wed, 20 Sep 2017 13:46:14 -0700 (PDT) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , "David S. Miller" , netdev@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Date: Wed, 20 Sep 2017 13:45:26 -0700 Message-Id: <1505940337-79069-21-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505940337-79069-1-git-send-email-keescook@chromium.org> References: <1505940337-79069-1-git-send-email-keescook@chromium.org> Subject: [kernel-hardening] [PATCH v3 20/31] caif: Define usercopy region in caif proto slab cache X-Virus-Scanned: ClamAV using ClamSMTP From: David Windsor The CAIF channel connection request parameters need to be copied to/from userspace. In support of usercopy hardening, this patch defines a region in the struct proto slab cache in which userspace copy operations are allowed. example usage trace: net/caif/caif_socket.c: setsockopt(...): ... copy_from_user(&cf_sk->conn_req.param.data, ..., ol) This region is known as the slab cache's usercopy region. Slab caches can now check that each copy operation involving cache-managed memory falls entirely within the slab's usercopy region. 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. Signed-off-by: David Windsor [kees: split from network patch, provide usage trace] Cc: "David S. Miller" Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook --- net/caif/caif_socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 632d5a416d97..c76d513b9a7a 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c @@ -1032,6 +1032,8 @@ static int caif_create(struct net *net, struct socket *sock, int protocol, static struct proto prot = {.name = "PF_CAIF", .owner = THIS_MODULE, .obj_size = sizeof(struct caifsock), + .useroffset = offsetof(struct caifsock, conn_req.param), + .usersize = sizeof_field(struct caifsock, conn_req.param) }; if (!capable(CAP_SYS_ADMIN) && !capable(CAP_NET_ADMIN))