From patchwork Mon Jun 15 12:12:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 11604687 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A76D4912 for ; Mon, 15 Jun 2020 12:14:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 84BDD206D7 for ; Mon, 15 Jun 2020 12:14:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="MW6WKUON" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729998AbgFOMOO (ORCPT ); Mon, 15 Jun 2020 08:14:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729908AbgFOMNc (ORCPT ); Mon, 15 Jun 2020 08:13:32 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3ECEDC061A0E; Mon, 15 Jun 2020 05:13:32 -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=EBziasLTB9yyj8vVMRpUDtYmmAnu214zH16u+u17qnY=; b=MW6WKUONFQZxICu7turzJKDY7v QGc2aDqWPAjffBuQW310yEAMTvWlwCDyU4WKshAhsUAvasBR9HL7nir4NZzck9WGSEqNtJGer6uJj hmc8sHyARGV+U9MyZFT5nuxJnlHsvvELiXKzwOfYtvPn9VEyWIqQ8Rifc/UOPO9H6xQjpy7ssP55z 3217JGlgjaaC3Y0vJYqNZcip+USpgQaErA/HobKBJh+/RCLPf0NWQFUY7n8BnWnRLZhI33Kf40nWG pkbvU0R6tu6ZF+uHnVZ5kMQjp24DTXDWl0jv9rc6mkQHFSnrFkCTwmXABHlTDWqw5pU6nA97b7z2R H/T/+/Yg==; Received: from 195-192-102-148.dyn.cablelink.at ([195.192.102.148] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jknzV-00074A-E8; Mon, 15 Jun 2020 12:13:29 +0000 From: Christoph Hellwig To: Al Viro Cc: Linus Torvalds , Ian Kent , David Howells , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-security-module@vger.kernel.org, netfilter-devel@vger.kernel.org Subject: [PATCH 10/13] integrity/ima: switch to using __kernel_read Date: Mon, 15 Jun 2020 14:12:54 +0200 Message-Id: <20200615121257.798894-11-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200615121257.798894-1-hch@lst.de> References: <20200615121257.798894-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org __kernel_read has a bunch of additional sanity checks, and this moves the set_fs out of non-core code. Signed-off-by: Christoph Hellwig --- security/integrity/iint.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/security/integrity/iint.c b/security/integrity/iint.c index e12c4900510f60..1d20003243c3fb 100644 --- a/security/integrity/iint.c +++ b/security/integrity/iint.c @@ -188,19 +188,7 @@ DEFINE_LSM(integrity) = { int integrity_kernel_read(struct file *file, loff_t offset, void *addr, unsigned long count) { - mm_segment_t old_fs; - char __user *buf = (char __user *)addr; - ssize_t ret; - - if (!(file->f_mode & FMODE_READ)) - return -EBADF; - - old_fs = get_fs(); - set_fs(KERNEL_DS); - ret = __vfs_read(file, buf, count, &offset); - set_fs(old_fs); - - return ret; + return __kernel_read(file, addr, count, &offset); } /*