{"id":816492,"url":"http://patchwork.ozlabs.org/api/patches/816492/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-7-git-send-email-keescook@chromium.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505940337-79069-7-git-send-email-keescook@chromium.org>","list_archive_url":null,"date":"2017-09-20T20:45:12","name":"[v3,06/31] vfs: Copy struct mount.mnt_id to userspace using put_user()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":true,"hash":"bec1edd40efe26e733bb56634e368a329eddfd59","submitter":{"id":10641,"url":"http://patchwork.ozlabs.org/api/people/10641/?format=json","name":"Kees Cook","email":"keescook@chromium.org"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/1505940337-79069-7-git-send-email-keescook@chromium.org/mbox/","series":[{"id":4231,"url":"http://patchwork.ozlabs.org/api/series/4231/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=4231","date":"2017-09-20T20:45:22","name":"Hardened usercopy whitelisting","version":3,"mbox":"http://patchwork.ozlabs.org/series/4231/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/816492/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/816492/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"hjNQ5NMm\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xyBhg56vbz9s83\n\tfor ;\n\tThu, 21 Sep 2017 06:50:27 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751866AbdITUqG (ORCPT );\n\tWed, 20 Sep 2017 16:46:06 -0400","from mail-pf0-f173.google.com ([209.85.192.173]:51927 \"EHLO\n\tmail-pf0-f173.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751824AbdITUqC (ORCPT\n\t); Wed, 20 Sep 2017 16:46:02 -0400","by mail-pf0-f173.google.com with SMTP id b70so2105535pfl.8\n\tfor ; Wed, 20 Sep 2017 13:46:02 -0700 (PDT)","from www.outflux.net\n\t(173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133])\n\tby smtp.gmail.com with ESMTPSA id\n\tl66sm8177273pfl.156.2017.09.20.13.45.57\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 20 Sep 2017 13:46:00 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=q79OKAMqF+dEH75tkt9jXSO5So9k1x8IdjLEiB288JE=;\n\tb=hjNQ5NMmJ5Of4XDVARaOl907lggYVZ5uHzxPaSMpDcLOH3ouV7COV2RymEFfwXIwcE\n\tdc8aGAeWX0+L/Qs/6uqRTMEBfuBO2aPc9Q8+yej4GOQ4MJo25E0Cxa+fuSeSrjRGFDKx\n\tULKmjVFILk7k1xzVberYW8aDxGHPqqZbt5alw=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=q79OKAMqF+dEH75tkt9jXSO5So9k1x8IdjLEiB288JE=;\n\tb=S7XoBCPVdMb/m/j6nkcfSqZ2SkKqDRvEbNHr0Chz9x8XPrNSOfuNC5ArFNuy+MX5cI\n\tEh4rJ/Y7DXSKr8qci4h+/8Wgr74AFqBLGJLVYaPSgvI4aSmJdy/8fvYUsJyFpaVh9nNh\n\tHW+XF+0ILPMpJ6cO1Tc/r/fnUvhVUBwrbabPl0eL1UdTel4NEM0lt7A61RnCFEXdTRpN\n\tLx5NT3dqbfXDaKj6Rr+sWVCbYrpJ+WrHVEfUIhKHdq+rmb67qkmvSLdqSU8Eso8I7Mvk\n\teIwOtAqvlXEQfzBnQdGog+Ulrie0TCerQeGVl2kgXmE2lzkqpmXkw39+1y2eDxDUfV7H\n\tFauQ==","X-Gm-Message-State":"AHPjjUgBS3TnMMb4y9x7D8kr9+6tOLQmyfTHyUIhJ6/4gg2tNKCJQDWa\n\tfGTHapas2E3/ox4UFgkuBLpbWg==","X-Google-Smtp-Source":"AOwi7QBQxBxW6CiwDwHyxAioBQ4iDn9rEdZKZbnUou3AZbvR9AnCwwjvv8xGEFacqVp47e0oGTZvzw==","X-Received":"by 10.99.119.133 with SMTP id s127mr3486949pgc.271.1505940361948;\n\tWed, 20 Sep 2017 13:46:01 -0700 (PDT)","From":"Kees Cook ","To":"linux-kernel@vger.kernel.org","Cc":"Kees Cook , David Windsor ,\n\tAlexander Viro ,\n\tlinux-fsdevel@vger.kernel.org, netdev@vger.kernel.org,\n\tlinux-mm@kvack.org, kernel-hardening@lists.openwall.com","Subject":"[PATCH v3 06/31] vfs: Copy struct mount.mnt_id to userspace using\n\tput_user()","Date":"Wed, 20 Sep 2017 13:45:12 -0700","Message-Id":"<1505940337-79069-7-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":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"From: David Windsor \n\nThe mnt_id field can be copied with put_user(), so there is no need to\nuse copy_to_user(). In both cases, hardened usercopy is being bypassed\nsince the size is constant, and not open to runtime manipulation.\n\nThis patch is verbatim from Brad Spengler/PaX Team's PAX_USERCOPY\nwhitelisting code in the last public patch of grsecurity/PaX based on my\nunderstanding of the code. Changes or omissions from the original code are\nmine and don't reflect the original grsecurity/PaX code.\n\nSigned-off-by: David Windsor \n[kees: adjust commit log]\nCc: Alexander Viro \nCc: linux-fsdevel@vger.kernel.org\nSigned-off-by: Kees Cook \n---\n fs/fhandle.c | 3 +--\n 1 file changed, 1 insertion(+), 2 deletions(-)","diff":"diff --git a/fs/fhandle.c b/fs/fhandle.c\nindex 58a61f55e0d0..46e00ccca8f0 100644\n--- a/fs/fhandle.c\n+++ b/fs/fhandle.c\n@@ -68,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,\n \t} else\n \t\tretval = 0;\n \t/* copy the mount id */\n-\tif (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,\n-\t\t\t sizeof(*mnt_id)) ||\n+\tif (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||\n \t copy_to_user(ufh, handle,\n \t\t\t sizeof(struct file_handle) + handle_bytes))\n \t\tretval = -EFAULT;\n","prefixes":["v3","06/31"]}