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: 9962407 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 D164D60234 for ; Wed, 20 Sep 2017 20:46:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C515629227 for ; Wed, 20 Sep 2017 20:46:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B9D8B2922B; Wed, 20 Sep 2017 20:46:47 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM 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 52FC029227 for ; Wed, 20 Sep 2017 20:46:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751970AbdITUqU (ORCPT ); Wed, 20 Sep 2017 16:46:20 -0400 Received: from mail-pg0-f46.google.com ([74.125.83.46]:56198 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751931AbdITUqO (ORCPT ); Wed, 20 Sep 2017 16:46:14 -0400 Received: by mail-pg0-f46.google.com with SMTP id b11so2320562pgn.12 for ; Wed, 20 Sep 2017 13:46:14 -0700 (PDT) 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=HxxjqW2gfA72rM6Qi1ffyu75Pqh08AeehjOnN6WTViqKOg3dlGkwepioCBTS3CbGFr zuVfAeeBqC9wg0hrB3CVYq2+YkZtuonskKE1OHDMH9gI7D0fiPR4pLUZcKRB4Y/dcNY2 3A7JewFc12auJ2jJo9Jpu8ggilifIRweUgXoWh/RHqyJaZtHYo6NQ9827G90ubJS63fg 0NpxvqfvOAkGuSpHZkxIR3DIRDWpfx3qAR8aYwEHCdk0OzW+mjIJ6RYmFbVrwhnc2K+C Ea4ONMpsnt49Lssyanzk/NbEPwGyUdfOBbaKB9qyz+sTQPUZ0f4Qdo8v9aqKvWkcuwUr wlMQ== X-Gm-Message-State: AHPjjUj3RTnE9eNf07AuMQbIxy6LLMCW5A+EVOs8j/fcZTf6xGbFb4js 6+sc9gjWM9e7AdNMmOJUAYuIsQ== 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) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id j14sm8379424pgs.15.2017.09.20.13.46.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 13:46:08 -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 Subject: [PATCH v3 20/31] caif: Define usercopy region in caif proto slab cache 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> 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 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))