From patchwork Tue Dec 10 15:03:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Maiolino X-Patchwork-Id: 11282751 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 582C214B7 for ; Tue, 10 Dec 2019 15:04:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3702720828 for ; Tue, 10 Dec 2019 15:04:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FZV9y6IL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727566AbfLJPEH (ORCPT ); Tue, 10 Dec 2019 10:04:07 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:23283 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727568AbfLJPEH (ORCPT ); Tue, 10 Dec 2019 10:04:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PFVcksSLCjF9q7kRUkUqKvCGPoHM1ZfRxRp7U8aUWHA=; b=FZV9y6ILhr4LivZvVOfiQnB1Bb7Swtaj4yfnLl4y4Cl+NGZ0P7rzZn7XnPtRvqKEHEEiel FH+f8Qo1EvbMnsUT6EJ+2h4apEFov9HUIEmIZa1fmltarAFegUefD6ehctPS9rrypnaHQ8 4qGDEIJWSp0mehUz/j4nkbyG1dYc4Qc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-384-m7b-B7QIN166uDhlLMThDA-1; Tue, 10 Dec 2019 10:04:05 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12F249799F; Tue, 10 Dec 2019 15:04:04 +0000 (UTC) Received: from orion.redhat.com (ovpn-205-230.brq.redhat.com [10.40.205.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3676F1001925; Tue, 10 Dec 2019 15:04:03 +0000 (UTC) From: Carlos Maiolino To: linux-fsdevel@vger.kernel.org Cc: hch@lst.de Subject: [PATCH 4/5] fibmap: Use bmap instead of ->bmap method in ioctl_fibmap Date: Tue, 10 Dec 2019 16:03:43 +0100 Message-Id: <20191210150344.112181-5-cmaiolino@redhat.com> In-Reply-To: <20191210150344.112181-1-cmaiolino@redhat.com> References: <20191210150344.112181-1-cmaiolino@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: m7b-B7QIN166uDhlLMThDA-1 X-Mimecast-Spam-Score: 0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Now we have the possibility of proper error return in bmap, use bmap() function in ioctl_fibmap() instead of calling ->bmap method directly. Reviewed-by: Christoph Hellwig Signed-off-by: Carlos Maiolino --- fs/ioctl.c | 29 +++++++++++++++++++---------- include/linux/fs.h | 9 ++++++++- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/fs/ioctl.c b/fs/ioctl.c index 2f5e4e5b97e1..83f36feaf781 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -54,19 +54,28 @@ EXPORT_SYMBOL(vfs_ioctl); static int ioctl_fibmap(struct file *filp, int __user *p) { - struct address_space *mapping = filp->f_mapping; - int res, block; + struct inode *inode = file_inode(filp); + int error, ur_block; + sector_t block; - /* do we support this mess? */ - if (!mapping->a_ops->bmap) - return -EINVAL; if (!capable(CAP_SYS_RAWIO)) return -EPERM; - res = get_user(block, p); - if (res) - return res; - res = mapping->a_ops->bmap(mapping, block); - return put_user(res, p); + + error = get_user(ur_block, p); + if (error) + return error; + + block = ur_block; + error = bmap(inode, &block); + + if (error) + ur_block = 0; + else + ur_block = block; + + error = put_user(ur_block, p); + + return error; } /** diff --git a/include/linux/fs.h b/include/linux/fs.h index c5b86e53e568..7d9bda8ef3db 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2865,9 +2865,16 @@ static inline ssize_t generic_write_sync(struct kiocb *iocb, ssize_t count) extern void emergency_sync(void); extern void emergency_remount(void); + #ifdef CONFIG_BLOCK -extern int bmap(struct inode *, sector_t *); +extern int bmap(struct inode *inode, sector_t *block); +#else +static inline int bmap(struct inode *inode, sector_t *block) +{ + return -EINVAL; +} #endif + extern int notify_change(struct dentry *, struct iattr *, struct inode **); extern int inode_permission(struct inode *, int); extern int generic_permission(struct inode *, int);