Received: by 10.213.65.68 with SMTP id h4csp289655imn; Tue, 13 Mar 2018 04:35:41 -0700 (PDT) X-Google-Smtp-Source: AG47ELuSNiJpyHYXFPMm7EHRSI1wTd39r9M7AzbtSN5NXnd/OnbBvfPFOalGP01FaVLt/LuIIibi X-Received: by 10.99.121.203 with SMTP id u194mr247472pgc.232.1520940940974; Tue, 13 Mar 2018 04:35:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520940940; cv=none; d=google.com; s=arc-20160816; b=aJnhY+2MyArLKYLrzWtHryCCRD0IEpFSySzIdc0q9eCCgRnwFABc4baHoBOtHhaHZR VQpieYeeENuOqtb4maLHObmP/Lqw2qISyr5KmBAHnNecBoLKZj59Ft5ri4OYdohK4/ch Q3N/C74KQCcNg0rzbrOb3CVr6t7duJZtwXsAL5wUER7+pryzRm2V5ADPw50wtzOSUcxy enHGhpmtsu01JsjgTApqUPpgYA+U3sT+TnrvL3+bvvOSoEz0++PFM39ZBAQPS4Gnx8q1 sFEqnAjjk8gG2zriNcqYbRiQhiRSEqemwiCzNavKtC2e0aikrjCDvCjZXglP8uHDq6LH KG3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=m/1MMVR20LBA+/YitWuT/w2UJi6I85gtuHQLFJ1vSdI=; b=CvbQtSuyvqR5ELBBSHJ/dWukQLrJ2o4Q6DaZnS6PYpenKQiH7BEadp2iZeqN8AXRNd R4BTgmpnsjUDbngrCPr++Lzmz0bCun73PbQtkcDW1CJXPgqlyZ2Q/goHq24uN27lBvTQ d+7PM8FygqYsh+VINbNKBX0slZ5gb3S5IeNWoI/7QxddsmfkK/gsi4K1C8HEqeIn22lT p31L/9e5WMgjSUOx3Mp6y3p+RNdIxPauCbYjo6oZOJ++VzWis+H/Y9dvLFsKiSB1a8m4 63CiyqEgAO+oEdX0fizPGxyDLgDN8CVkQd1HVCutEd9dAkTwXa2fVWQoUDBH84RXXfat MxNw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w27si6900pfl.142.2018.03.13.04.35.26; Tue, 13 Mar 2018 04:35:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933048AbeCMLd7 (ORCPT + 99 others); Tue, 13 Mar 2018 07:33:59 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:6195 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933037AbeCMLd5 (ORCPT ); Tue, 13 Mar 2018 07:33:57 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 8901E507594A2; Tue, 13 Mar 2018 19:33:42 +0800 (CST) Received: from huawei.com (10.175.124.28) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.361.1; Tue, 13 Mar 2018 19:33:34 +0800 From: sunqiuyang To: , , CC: Subject: [PATCH 1/1] f2fs: release locks before return in f2fs_ioc_gc_range() Date: Tue, 13 Mar 2018 19:42:50 +0800 Message-ID: <20180313114250.29211-1-sunqiuyang@huawei.com> X-Mailer: git-send-email 2.13.6 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.124.28] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qiuyang Sun Currently, we will leave the kernel with locks still held when the gc_range is invalid. This patch fixes the bug. Signed-off-by: Qiuyang Sun --- fs/f2fs/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index c4c27e6..ee88058 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2059,8 +2059,10 @@ static int f2fs_ioc_gc_range(struct file *filp, unsigned long arg) return ret; end = range.start + range.len; - if (range.start < MAIN_BLKADDR(sbi) || end >= MAX_BLKADDR(sbi)) - return -EINVAL; + if (range.start < MAIN_BLKADDR(sbi) || end >= MAX_BLKADDR(sbi)) { + ret = -EINVAL; + goto out; + } do_more: if (!range.sync) { if (!mutex_trylock(&sbi->gc_mutex)) { -- 2.5.0