From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753107AbdI1MlH (ORCPT ); Thu, 28 Sep 2017 08:41:07 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:48156 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753025AbdI1MlC (ORCPT ); Thu, 28 Sep 2017 08:41:02 -0400 From: Mimi Zohar To: linux-security-module@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, Mimi Zohar , linux-integrity@vger.kernel.org, Christoph Hellwig , Linus Torvalds , Linux Kernel Mailing List , Jan Kara , "Theodore Ts'o" Subject: [RFC PATCH 2/3] integrity: use call_read_iter to calculate the file hash Date: Thu, 28 Sep 2017 08:39:32 -0400 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1506602373-4799-1-git-send-email-zohar@linux.vnet.ibm.com> References: <1506602373-4799-1-git-send-email-zohar@linux.vnet.ibm.com> X-TM-AS-MML: disable x-cbid: 17092812-0044-0000-0000-000002882A16 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17092812-0045-0000-0000-0000071E4C6B Message-Id: <1506602373-4799-3-git-send-email-zohar@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-09-28_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1709280189 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch replaces the ->read file operation method in integrity_kernel_read() with the newer ->read_iter and sets the read_iter rwf flag to indicate that the i_rwsem has been taken exclusively. Signed-off-by: Mimi Zohar --- security/integrity/iint.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/security/integrity/iint.c b/security/integrity/iint.c index c84e05866052..df406bb96792 100644 --- a/security/integrity/iint.c +++ b/security/integrity/iint.c @@ -16,11 +16,13 @@ * using a rbtree tree. */ #include +#include #include #include #include #include #include +#include #include "integrity.h" static struct rb_root integrity_iint_tree = RB_ROOT; @@ -184,18 +186,25 @@ security_initcall(integrity_iintcache_init); 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; + struct inode *inode = file_inode(file); + struct kvec iov = { .iov_base = addr, .iov_len = count }; + struct kiocb kiocb; + struct iov_iter iter; ssize_t ret; + lockdep_assert_held(&inode->i_rwsem); + if (!(file->f_mode & FMODE_READ)) return -EBADF; + if (!file->f_op->read_iter) + return -EBADF; - old_fs = get_fs(); - set_fs(get_ds()); - ret = __vfs_read(file, buf, count, &offset); - set_fs(old_fs); + init_sync_kiocb(&kiocb, file); + kiocb.ki_pos = offset; + iov_iter_kvec(&iter, READ | ITER_KVEC, &iov, 1, count); + ret = call_read_iter(file, &kiocb, &iter, 1); + BUG_ON(ret == -EIOCBQUEUED); return ret; } -- 2.7.4