From patchwork Mon Oct 24 11:27:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9246 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp461282wru; Mon, 24 Oct 2022 06:43:33 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7FJCRjUv5JeaoyDTy2N5tfwu7ypjXv9bOrypZwI8QnxTzaMq3h/ldw0tpdav7GbHpF9WdC X-Received: by 2002:a17:907:75e6:b0:7a1:848:20cb with SMTP id jz6-20020a17090775e600b007a1084820cbmr10257827ejc.745.1666619013604; Mon, 24 Oct 2022 06:43:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666619013; cv=none; d=google.com; s=arc-20160816; b=cJigxFSsGGEq5IekcUjxINyJQJkvMsYUrvTQQYsKo1r4P1dRlqhfn66mT1nIWeAw9u m2xqxU3c+MMKOcqYHrb48avK4A+3pTLsRvoWfpKZp/EDuPkIyf6j2J3kSRM4ZFaVUJDq nLUNqHoZneggTheU7G0jFvVgIIjmbzUv6mVHsGvheI/P36TKgN1BR4F7kJJiG1Yn7zfJ S97mymUqM7Z0eqD0ZdbOPH/bk5ut0wZ713UVBcbQdU3Gicxn6flfWK0CkczzPVpX93XK qvsleBYpTkqMCjgiQsC+7+hTDpmio2ieXn8mtf8msr0/B7u7X0qekccsomzg6Fk8qQTN DWgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zoLsly3rSX2k+tJrefEqaG3ZAdumxmHDrsw1ro01eYY=; b=SqdLm9zlHLjcBoWMnYzFRWIvoRk99q7IUYZIPWOKKi3o3XVKst/+t4eqROaKoL6oa/ JURHBHTttiHiBcOBk3zlGHAn6WJTXMaaqyFFsrxyyYOPQdYW0lSsV2pc6pcajsNwS7Fd jy7veGn31uACQ67cte9SvDBPytOv0RuxcHh8CIZdPSj4h1ftnGafk8nlISfPc65pBVV1 8Iz/T4WkidPZUTymsgfI5uG0qtNNaA0pZ1OAU/ciMzLQ+pLOVZaM9Rjx5AVqxWh+oLKl rdTx5LR5cuHkIb1j2JgBHFf5JoEiLXJJbt5To/aMBvin+46F3uVX9kS8+e9ODz6L+yFh reNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UjMUZmEC; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b14-20020a056402084e00b00457205ae2b5si33494353edz.358.2022.10.24.06.43.10; Mon, 24 Oct 2022 06:43:33 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=UjMUZmEC; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236202AbiJXNfC (ORCPT + 99 others); Mon, 24 Oct 2022 09:35:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236264AbiJXNaM (ORCPT ); Mon, 24 Oct 2022 09:30:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC480ACA11; Mon, 24 Oct 2022 05:33:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0F20F61326; Mon, 24 Oct 2022 12:18:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1CA42C433D6; Mon, 24 Oct 2022 12:18:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613892; bh=HyQXrJH1l3T0A4SR0/zGg1i70pBwz1wEYQUnliiTFqs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UjMUZmEC2YuGop6e9IuWDV8cAokfRWNPp0BVaUDXj8WKuAcwfBpxXOclPUqW41eM1 iH8KOrLLC/rXASeL0bw2qVzhYqsI4YF1p3RvoSmhgzqUbAmd+V6S1wwM7R1RvsCRwp GRy7zarnxg/V8NqNalKj4RGCZno8mjIfELK9mSKc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexander Aring , David Teigland Subject: [PATCH 5.10 024/390] fs: dlm: handle -EBUSY first in lock arg validation Date: Mon, 24 Oct 2022 13:27:01 +0200 Message-Id: <20221024113023.583457472@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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?1747576698394900394?= X-GMAIL-MSGID: =?utf-8?q?1747576698394900394?= From: Alexander Aring commit 44637ca41d551d409a481117b07fa209b330fca9 upstream. During lock arg validation, first check for -EBUSY cases, then for -EINVAL cases. The -EINVAL checks look at lkb state variables which are not stable when an lkb is busy and would cause an -EBUSY result, e.g. lkb->lkb_grmode. Cc: stable@vger.kernel.org Signed-off-by: Alexander Aring Signed-off-by: David Teigland Signed-off-by: Greg Kroah-Hartman --- fs/dlm/lock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -2888,24 +2888,24 @@ static int set_unlock_args(uint32_t flag static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_args *args) { - int rv = -EINVAL; + int rv = -EBUSY; if (args->flags & DLM_LKF_CONVERT) { - if (lkb->lkb_flags & DLM_IFL_MSTCPY) + if (lkb->lkb_status != DLM_LKSTS_GRANTED) goto out; - if (args->flags & DLM_LKF_QUECVT && - !__quecvt_compat_matrix[lkb->lkb_grmode+1][args->mode+1]) + if (lkb->lkb_wait_type) goto out; - rv = -EBUSY; - if (lkb->lkb_status != DLM_LKSTS_GRANTED) + if (is_overlap(lkb)) goto out; - if (lkb->lkb_wait_type) + rv = -EINVAL; + if (lkb->lkb_flags & DLM_IFL_MSTCPY) goto out; - if (is_overlap(lkb)) + if (args->flags & DLM_LKF_QUECVT && + !__quecvt_compat_matrix[lkb->lkb_grmode+1][args->mode+1]) goto out; }