From patchwork Tue Jul 7 17:47:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "hch@lst.de" X-Patchwork-Id: 11649481 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 B8F6A912 for ; Tue, 7 Jul 2020 17:49:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 993202075B for ; Tue, 7 Jul 2020 17:49:10 +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="qmF5VmcK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728528AbgGGRsY (ORCPT ); Tue, 7 Jul 2020 13:48:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728379AbgGGRsW (ORCPT ); Tue, 7 Jul 2020 13:48:22 -0400 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F1D5C061755; Tue, 7 Jul 2020 10:48:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=qmF5VmcKBpsDHE6C4O1/fcyX4d K/B1cdCEwDZbGcw/Ll9YvyVe96JKpOrEqbAVaBR+bi7XaraAOMfKE4nMwJ0VUXUiAs+QLB/Iz/T53 7VS2mIp4AYuUB1GKS8oqE06rEjDJAChOYNs0HYjIuqRDyjLzeU3cMNIy3lC78Wm1he3HgXwo4bOea BvxXoM7wbZuVumkOguZul7s2Cg9EmeKsCGqX3laVk86D68UM7oPDu9yTRLZ/ObzDIIs/GjCDjiXpK 94Dimp2sIiy1OEDMnwWD9EpGnmFUrnIXk2e1mvbUZCZ9MFB01hGPnPjCx5Ug67KzwvTN8w/rb/Y5t yJRxDikQ==; Received: from [2001:4bb8:18c:3b3b:a49f:8154:a2b7:8b6c] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsrhX-0003Ie-6h; Tue, 07 Jul 2020 17:48:15 +0000 From: Christoph Hellwig To: Al Viro , Linus Torvalds , Stephen Rothwell Cc: Luis Chamberlain , Matthew Wilcox , Kees Cook , Iurii Zaikin , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 10/23] integrity/ima: switch to using __kernel_read Date: Tue, 7 Jul 2020 19:47:48 +0200 Message-Id: <20200707174801.4162712-11-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200707174801.4162712-1-hch@lst.de> References: <20200707174801.4162712-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.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); } /*