From patchwork Fri Mar 10 21:27:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 67709 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1109103wrd; Fri, 10 Mar 2023 13:31:34 -0800 (PST) X-Google-Smtp-Source: AK7set+CUOjlXqmFYFoPCO+Y8XkISDn6Q4U4pEuPO3ztVZhEr8pMkZFQliHKN8Sav3N98teqk4hP X-Received: by 2002:a17:902:e809:b0:19a:9890:eac6 with SMTP id u9-20020a170902e80900b0019a9890eac6mr31879084plg.24.1678483894113; Fri, 10 Mar 2023 13:31:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678483894; cv=none; d=google.com; s=arc-20160816; b=O40oJ4uEQl5JOrIr/Vv0rtFMjZLVtGuMIQcsPW1ylUmmhTS23gFOoZB9z8zJ42fwqp NJCfXDnt3xWwnnrFMDikISs7PO/qEUJslFjheL3vBxJ7WfI16fYRaD9qHCGyXOssVZ6a cwxNcLxYsCzyRko9etCSaJJjHuK7HD8pY2uE+Rql1DFn0vwZ903K4Fh59JtXN87e4a1Z Swua68jxLxhxSvPSuNFGbn9hiVvNfGl9GeY/GG7X3koyXNdZpQD4i7zd3oVhFqtroh2X zV8NcwHb7Uirkp/T8FBUKFePhtPRg/B5AisfTV8ATZgnvtYRWy+k/Spy7QE9YXcy1GQQ m1qw== 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=gMRVk9alI+8EWOaupK6tdpMdZP6n/jEk5vdgSWB8iIo=; b=Bzit+bZqvq7xUqiFaBdJF9my/AlobTzgjGyz8B81laj0dXDBc9+l583nnphFgkj4v3 CpzHdjJ6N35m+3C9geH0rh2kk7Em3txmOW7ykz2xHnZWwxNRqXQjX8MGpOaUtfJWiUsW DWSdtP8SIBpg6a63E/BKW8tgx9T6nyz881FwlY6gFD3ixbRVgtnLllAP6MzMYaEGpFgM 7lDereut0HuLDWzDwhGMrfVzgS9mT+qnp+hKjaDkPj/7Ydcp/8LZj+MCAyoKZDf1afKI YLfeuKzFN4c3uDcHiphFa6DZsCWdsrG3OP+tTC9inDavJZa6tuzY4an9yEto4Rt2Qp+U mZrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b="aBiYWIj/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zeniv.linux.org.uk Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g2-20020a1709026b4200b001960ccac224si822844plt.2.2023.03.10.13.30.56; Fri, 10 Mar 2023 13:31:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b="aBiYWIj/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zeniv.linux.org.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231895AbjCJV2Q (ORCPT + 99 others); Fri, 10 Mar 2023 16:28:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231768AbjCJV1w (ORCPT ); Fri, 10 Mar 2023 16:27:52 -0500 Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [IPv6:2a03:a000:7:0:5054:ff:fe1c:15ff]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD4731269B6; Fri, 10 Mar 2023 13:27:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=linux.org.uk; s=zeniv-20220401; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=gMRVk9alI+8EWOaupK6tdpMdZP6n/jEk5vdgSWB8iIo=; b=aBiYWIj/FFql3mDoJoCrpNjliH lDrPD21A5bENfsef/ahV5xpG6xFR1h7IMK9Am1AleaoR1n9vWkvpcdOCipslYrFhf7udUqOE6y39G H3FLUZ5yN7613QFS07/lR7tCdrYIWJl5hn1A0KHn3C1e5ljrQEBOSSdJX7bqsaj5FY8QyFSI+MacJ 8RVmf7nmunB1tT3+kRoJX31uXpK3OKj8z43VulUQgwZMH5P1RHRnK4EXDY255hdJy1/N5lAtfTv78 nTlUZo2C+yT5Srz/vSPmi3X0kRD4pGyTpBs4fTgzpbgGPVpaVUUnZoCYsu6BVqXW8WWJnfroI7nCs e7jk+tDA==; Received: from viro by zeniv.linux.org.uk with local (Exim 4.96 #2 (Red Hat Linux)) id 1pakHG-00FR6P-1F; Fri, 10 Mar 2023 21:27:50 +0000 From: Al Viro To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 8/8] fuse_dev_ioctl(): switch to fdget() Date: Fri, 10 Mar 2023 21:27:48 +0000 Message-Id: <20230310212748.3679076-8-viro@zeniv.linux.org.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310212748.3679076-1-viro@zeniv.linux.org.uk> References: <20230310212536.GX3390869@ZenIV> <20230310212748.3679076-1-viro@zeniv.linux.org.uk> MIME-Version: 1.0 Sender: Al Viro X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760017927905806948?= X-GMAIL-MSGID: =?utf-8?q?1760017927905806948?= Signed-off-by: Al Viro --- fs/fuse/dev.c | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index eb4f88e3dc97..1a8f82f478cb 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -2257,30 +2257,31 @@ static long fuse_dev_ioctl(struct file *file, unsigned int cmd, int res; int oldfd; struct fuse_dev *fud = NULL; + struct fd f; switch (cmd) { case FUSE_DEV_IOC_CLONE: - res = -EFAULT; - if (!get_user(oldfd, (__u32 __user *)arg)) { - struct file *old = fget(oldfd); - - res = -EINVAL; - if (old) { - /* - * Check against file->f_op because CUSE - * uses the same ioctl handler. - */ - if (old->f_op == file->f_op) - fud = fuse_get_dev(old); - - if (fud) { - mutex_lock(&fuse_mutex); - res = fuse_device_clone(fud->fc, file); - mutex_unlock(&fuse_mutex); - } - fput(old); - } + if (get_user(oldfd, (__u32 __user *)arg)) + return -EFAULT; + + f = fdget(oldfd); + if (!f.file) + return -EINVAL; + + /* + * Check against file->f_op because CUSE + * uses the same ioctl handler. + */ + if (f.file->f_op == file->f_op) + fud = fuse_get_dev(f.file); + + res = -EINVAL; + if (fud) { + mutex_lock(&fuse_mutex); + res = fuse_device_clone(fud->fc, file); + mutex_unlock(&fuse_mutex); } + fdput(f); break; default: res = -ENOTTY;