From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516768074-2-2741673540440028280 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516768073; b=B/D5gJeziAMClPqgiMFgKlf6KMiiDoWkFgKCPIFPq0ugOYa +/Hs8cY8SQXkP06uI1JQcz4jFAygU43GkWAlGESUNH/b5Xa5x4D7CxdmnBOEmTPL PoDM8KXta0lGOOZkYy9+ImLmDwzAgfpoSEDHA+I1D/O8KDiZ4UxMsJGzv7Lm/S5D H3WSSrBYcqc0CW/3uJSmNBSjwUKZZbiaRHs+2N1ovOvABnU9jQHw10giri63GTDZ g+6NZnhg5Tq5YOLYG5dwAjBZSI+Yo1lEWaoMzFZf7ZzWxGqUUYoKgWdfwIDx7EHZ YK1KgFg5vjOzk6e+MDAfX8+A35cEcqUOMpzDmjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1516768073; bh=rwfeSx QKsM6LS5MNsT+XyRykuwZEroO45sbRyOL/imo=; b=rmMhaIc8J6+ZsJz+9SJxQQ SumifugiNea01y3TQbHZ23MaOTHPXTVIr8j0rYvFaLyu6nA5FUXbJEb7h4K6VxG2 RQJfpOafcaacMslkrx02vhODN1kBNqM9AhagSEhxlqPzBoIZhzYkyaYdqBLWAZkO /kUA5x5THPdlKhke5a7LWQsxW2DV9oCtAxEo+VgDW3IDm5+XUyvhcV4qegnnBbir CAquHwzZCRnohrBS45um+zW32mT+XeHLPkLta2wbItS9fFaKoFvcxQfckdbDIxKw bmEu5rv8hSz+0aYwlgjv6Nlxh0oExNnB2Mn50iW4+/jsAdDjEWFM7UGb4Hzdnmnw == ARC-Authentication-Results: i=1; mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=OPettZiL x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx6.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=OPettZiL x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933154AbeAXE1i (ORCPT ); Tue, 23 Jan 2018 23:27:38 -0500 Received: from mail-dm3nam03on0111.outbound.protection.outlook.com ([104.47.41.111]:38880 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933211AbeAXETa (ORCPT ); Tue, 23 Jan 2018 23:19:30 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Trond Myklebust , "J . Bruce Fields" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 20/35] nfsd: Ensure we check stateid validity in the seqid operation checks Thread-Topic: [PATCH AUTOSEL for 4.4 20/35] nfsd: Ensure we check stateid validity in the seqid operation checks Thread-Index: AQHTlMovrv0lWsOaXUK40TGfbdr7JA== Date: Wed, 24 Jan 2018 04:17:02 +0000 Message-ID: <20180124041645.32420-20-alexander.levin@microsoft.com> References: <20180124041645.32420-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041645.32420-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1094;7:x6ewZqGXOaC5bIOSqa27nE/BYy5RkgUy2B9aWHJ4N1PwKf+81/69JQh1nNJErUjhdC98PNYjJvN6qhR/yB9dedRMrMNXAEc569WXAxu+bAlY8lZvam8j6Xk3Iet8zHKkFovV0Y3Wlk1FgMnHHwZz+X/JDIPnYlw6RsrFjDVzPeCM4EZrbB4mduOXHFbQ2GH3WINBdzr08xIPo0L04Za1X4TTi+ul6jxQ1D+npwi+CzG0n0Le+gxNc1WeL8vybAQc x-ms-office365-filtering-correlation-id: fe636116-4e7d-43c0-158f-08d562e1a5b7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB1094; x-ms-traffictypediagnostic: DM5PR2101MB1094: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(3231046)(2400081)(944501161)(10201501046)(3002001)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123560045)(20161123564045)(6072148)(201708071742011);SRVR:DM5PR2101MB1094;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1094; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(376002)(396003)(366004)(39860400002)(39380400002)(199004)(189003)(14454004)(99286004)(10090500001)(2906002)(86612001)(2900100001)(2950100002)(575784001)(107886003)(5250100002)(2501003)(26005)(316002)(4326008)(97736004)(54906003)(106356001)(110136005)(25786009)(6666003)(5660300001)(36756003)(305945005)(86362001)(8936002)(3280700002)(6116002)(68736007)(102836004)(3660700001)(6512007)(10290500003)(72206003)(1076002)(105586002)(6436002)(22452003)(59450400001)(53936002)(478600001)(3846002)(7736002)(6486002)(6346003)(81156014)(66066001)(6506007)(8676002)(76176011)(81166006)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1094;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: HGdj3hBpYG8Rjaa4PrwaQwvvzPssiibmBo9V4B8jTpyI1Kqfq5Yue11B1ezEURqijIKKeOOIfWl0U8J9LE+MkQ== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe636116-4e7d-43c0-158f-08d562e1a5b7 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:17:02.6715 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1094 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Trond Myklebust [ Upstream commit 9271d7e509c1bfc0b9a418caec29ec8d1ac38270 ] After taking the stateid st_mutex, we want to know that the stateid still represents valid state before performing any non-idempotent actions. Signed-off-by: Trond Myklebust Signed-off-by: J. Bruce Fields Signed-off-by: Sasha Levin --- fs/nfsd/nfs4state.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 439f01a0bc49..1b05769f18cf 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5018,15 +5018,9 @@ static __be32 nfs4_seqid_op_checks(struct nfsd4_comp= ound_state *cstate, stateid_ status =3D nfsd4_check_seqid(cstate, sop, seqid); if (status) return status; - if (stp->st_stid.sc_type =3D=3D NFS4_CLOSED_STID - || stp->st_stid.sc_type =3D=3D NFS4_REVOKED_DELEG_STID) - /* - * "Closed" stateid's exist *only* to return - * nfserr_replay_me from the previous step, and - * revoked delegations are kept only for free_stateid. - */ - return nfserr_bad_stateid; - mutex_lock(&stp->st_mutex); + status =3D nfsd4_lock_ol_stateid(stp); + if (status !=3D nfs_ok) + return status; status =3D check_stateid_generation(stateid, &stp->st_stid.sc_stateid, nf= sd4_has_session(cstate)); if (status =3D=3D nfs_ok) status =3D nfs4_check_fh(current_fh, &stp->st_stid); --=20 2.11.0