Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp3178024ybz; Mon, 27 Apr 2020 11:21:16 -0700 (PDT) X-Google-Smtp-Source: APiQypIGBF/KDJmAazjvuY1PeP4MfR9tZBXPJURCsFTzY9zmhk2qqGRrYpAb+pnic4EUvlzTua6H X-Received: by 2002:aa7:cdcb:: with SMTP id h11mr18702314edw.264.1588011676616; Mon, 27 Apr 2020 11:21:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588011676; cv=none; d=google.com; s=arc-20160816; b=sF89kp3+g29DlXUIFAz/xsbO8ASyXqepd6gxDKcqiCeHP9Rll80W34K9xZCqWLRVwg Plm4ORdzk7E/gAOZi08T9buRVuRV+3ZD6Y41QybpJAKtYnPL8I4zWr8eKuhitYzxcZ8/ 9CQs+E4KaGB+12VDIXz97RxatpVioxRInpQlLe7WE0SXRNvEZYRS0M6h1Vvgp6NlyR4y 8JKk3wIss3IFgWau6OfvTp3vMdseRcMCwW4UAI8UgY8olueTZJVlsikJ9TAFMUaQr9vu JEgF6MEuoHLkXyaMWebF3+78oAVFlduu9bQLofTpogjsQDw6Qovj+ObjSPjAf1qkCDls 06JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pBDtFKgKjFPTy/7kZQr6MjBBEStoexbRszb28pwTV8g=; b=Azq1xlqRUEEuVstDdHCig+k7mN4T1rmxBixfVRkRXBYcQtVusR6iJ7OsxDnRL/i8Za mX0FY9Kaou3R2iF2+55il2boJm0q8HBcovGBYcKRNPEruQwF3N/ubQX2D+PaLZZDLSN7 bdOkj/uE9Xvk2xiB+QeJMUxdWKKsWyTCiJQqoMJjD+ufmwpb9kpQlqwk8wGJfgqvIGOl Bal3HO7p5tTiPHJKKtCq8RGO3FuPyGR9AyAKXCcylDIruze581dZjQfoRIeX7R8ibxoZ +i+EuJWPqRKP7l41hAVItQt86dwcYOCyZR+wEegu+B/8TGsU7qVOyZf+C38rh6p3r4hN trOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=e2w8d7Zn; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e23si209463edy.578.2020.04.27.11.20.52; Mon, 27 Apr 2020 11:21:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=e2w8d7Zn; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726519AbgD0SUZ (ORCPT + 99 others); Mon, 27 Apr 2020 14:20:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726252AbgD0SUY (ORCPT ); Mon, 27 Apr 2020 14:20:24 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3A48C0610D5; Mon, 27 Apr 2020 11:20:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=pBDtFKgKjFPTy/7kZQr6MjBBEStoexbRszb28pwTV8g=; b=e2w8d7Zn8pEP+kltNMu3Tb8Bq5 57+PSY23PPuEgo9i5nTwlWTtu+rl8xEw3pgshCSAdlPTV1pxnp59RKTcA5Ydj1RSe7NZkyeuKnzOV /zbLbQ7oC+VqfbVkCx18wnvK/Vg3s779Ur+sGOJCsakZcvg9Tr9sF2s4+Ou7d65y9aUYHAiK9gIde BUBxEdHqxTNrnVCOyZD/lkYXXA4nu+sovXAm4sPLKhIcLYgufUcKYai6abZ8uqQXzhWHE0+3y1mo7 1gQei8xp1G/Wi8X4WVbj18hIj00o8i+6z+IfPrISx/8XyjZTbD6CTsuut0/i9ny3o5/DhbmYbf71n egcrWlcA==; Received: from [2001:4bb8:193:f203:c70:4a89:bc61:2] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jT8Mi-0004cF-8j; Mon, 27 Apr 2020 18:20:24 +0000 From: Christoph Hellwig To: linux-ext4@vger.kernel.org, viro@zeniv.linux.org.uk Cc: jack@suse.cz, tytso@mit.edu, adilger@dilger.ca, riteshh@linux.ibm.com, amir73il@gmail.com, linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org Subject: [PATCH 10/11] fs: remove the access_ok() check in ioctl_fiemap Date: Mon, 27 Apr 2020 20:19:56 +0200 Message-Id: <20200427181957.1606257-11-hch@lst.de> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200427181957.1606257-1-hch@lst.de> References: <20200427181957.1606257-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org access_ok just checks we are fed a proper user pointer. We also do that in copy_to_user itself, so no need to do this early. Signed-off-by: Christoph Hellwig --- fs/ioctl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/ioctl.c b/fs/ioctl.c index ae0d228d18a16..d24afce649037 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -209,13 +209,9 @@ static int ioctl_fiemap(struct file *filp, struct fiemap __user *ufiemap) fieinfo.fi_extents_max = fiemap.fm_extent_count; fieinfo.fi_extents_start = ufiemap->fm_extents; - if (fiemap.fm_extent_count != 0 && - !access_ok(fieinfo.fi_extents_start, - fieinfo.fi_extents_max * sizeof(struct fiemap_extent))) - return -EFAULT; - error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, fiemap.fm_length); + fiemap.fm_flags = fieinfo.fi_flags; fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped; if (copy_to_user(ufiemap, &fiemap, sizeof(fiemap))) -- 2.26.1