Message ID | 1515531365-37423-10-git-send-email-keescook@chromium.org |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="JWZbhbph"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zGPjv1yWNz9s71 for <patchwork-incoming@ozlabs.org>; Wed, 10 Jan 2018 08:02:59 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760109AbeAIVAs (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Tue, 9 Jan 2018 16:00:48 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:46692 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759827AbeAIU5T (ORCPT <rfc822;netdev@vger.kernel.org>); Tue, 9 Jan 2018 15:57:19 -0500 Received: by mail-pg0-f68.google.com with SMTP id r2so8813822pgq.13 for <netdev@vger.kernel.org>; Tue, 09 Jan 2018 12:57:19 -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=YYfC+DZQIpooLWprJKwbjG+yk8h1hsIjZlvBMsoOx2U=; b=JWZbhbph5Wajrv3Vj41GvN77On2Hu808IUALWtWpbxQ6PO3dNCGKGsaabI01ZLvD1d n7TdkKLjl3yjD9A5xmFvVmjMursnMVsBsfw/W8u7zBaQjyiWQ5JR47PNgO5TQqkV/DKS OHHeZgIgZ8/uBR2E1JtzikieEyV117HC9gaAA= 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=YYfC+DZQIpooLWprJKwbjG+yk8h1hsIjZlvBMsoOx2U=; b=DKiCYT/UuGYCqZrPa1dPjhctt5a8ky8/OFFm6VuIZUBZrZNyU13FWrQjrL1Gyxe5J1 HuIzylJoKU7b93bXYxN3YSbvLmvHp1+334Tubx4syI6l2VhaE15SQz0/xTfXBVZ1XEgO AIYlimIHT0cAM/QD+4E7qM2S8snavOUc2xtrOQunBp52VP9n6MEkheptv3gSp6/FtQZn iDG20oJJa3PwExw/kW3ACJBBs8NJPca/PWW1e6UaNmbYTmOZOjXBZ9dZZZGobHQYl8F1 knT6I2Vnqa3TmM6sBl3bc0kWbo+2urRhbk75Vd9ctMtIz1sogE+Q0gFjaUWRFMPOPxUr yI6Q== X-Gm-Message-State: AKGB3mJQpJomrPl7/UlzNv7lcCRfqiNQxK5HxTXddsNzD1Qdv/XzLYND 9Q1Qdi/TygHf5XKeMHg7FlYOzg== X-Google-Smtp-Source: ACJfBostf40lCxLXGBx3BuNjIicczxaOkbZJFPmrnR49nPUrRZMvhh3Sl2GVWDEKe6zZ9ydSewfiBg== X-Received: by 10.159.247.203 with SMTP id v11mr11808466plz.259.1515531439252; Tue, 09 Jan 2018 12:57:19 -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 z13sm5801204pgp.28.2018.01.09.12.56.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jan 2018 12:57:18 -0800 (PST) From: Kees Cook <keescook@chromium.org> To: linux-kernel@vger.kernel.org Cc: Kees Cook <keescook@chromium.org>, David Windsor <dave@nullcore.net>, Alexander Viro <viro@zeniv.linux.org.uk>, linux-fsdevel@vger.kernel.org, Linus Torvalds <torvalds@linux-foundation.org>, Andrew Morton <akpm@linux-foundation.org>, Andy Lutomirski <luto@kernel.org>, Christoph Hellwig <hch@infradead.org>, Christoph Lameter <cl@linux.com>, "David S. Miller" <davem@davemloft.net>, Laura Abbott <labbott@redhat.com>, Mark Rutland <mark.rutland@arm.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, Paolo Bonzini <pbonzini@redhat.com>, Christian Borntraeger <borntraeger@de.ibm.com>, Christoffer Dall <christoffer.dall@linaro.org>, Dave Kleikamp <dave.kleikamp@oracle.com>, Jan Kara <jack@suse.cz>, Luis de Bethencourt <luisbg@kernel.org>, Marc Zyngier <marc.zyngier@arm.com>, Rik van Riel <riel@redhat.com>, Matthew Garrett <mjg59@google.com>, linux-arch@vger.kernel.org, netdev@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Subject: [PATCH 09/36] vfs: Copy struct mount.mnt_id to userspace using put_user() Date: Tue, 9 Jan 2018 12:55:38 -0800 Message-Id: <1515531365-37423-10-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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
Hardened usercopy whitelisting
|
expand
|
diff --git a/fs/fhandle.c b/fs/fhandle.c index 0ace128f5d23..0ee727485615 100644 --- a/fs/fhandle.c +++ b/fs/fhandle.c @@ -69,8 +69,7 @@ static long do_sys_name_to_handle(struct path *path, } else retval = 0; /* copy the mount id */ - if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id, - sizeof(*mnt_id)) || + if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) || copy_to_user(ufh, handle, sizeof(struct file_handle) + handle_bytes)) retval = -EFAULT;