From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-874563-1516767455-2-12490157818874883736 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=1516767454; b=dTNY71PfYsV25iK+j75gfegmzCGCF6SdGrHZHb0NT+rhK7W u9AtgCBSqDoGfD+RT+aFKTjz633SoFeZLq22kRxjw8ptH6SRxQhbVuVrnKO1rHqn a+nSZtClJfxCOh6xryddijGBAotmRoS3Ouv/ilq6XV1uoHXVCPGr4moIVXXLLDg/ LpmTTHK2uIwsy1tQwFtEVH/eobfGwRcSOWygUI+pPNhlAp6c2nuJgQepgpIOVK+N 4hXsgsad5VNnePS3cUzBSp7QlWp5l3bTN4KGyaRLCck7vYEMshytb4YQzv3loQsC OnrO1f+aNwPyaGFVbU0XJjBbAWQGTnL+4sNbYMg== 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=1516767454; bh=g949qT 2LdvgpVe0AVkOWgvd2bUg4UgiH7U9uBpyl0XE=; b=FPAuJX8a1YTaz84C2pNewg FojERZuOLpnFT2qdBCQdxJbME+6oR/eErldUJuoZSGqqtEvmu4BsrtWZXODBhIAC kOIYnk1jUBMls7AsOeusrQWIQQUbWSZDwGltwwFDCdIHYeUYEePP//E4FFwLJPV+ i/k0ZZeDtyWu76ms6Xy5rbnOSb4bHLelP/xNsmbaSwSFM6OBY1wfGhtxFfS1+/qG YR+gm9OowmdOzIbFN17BfAEen/UPciVAkqCB8JDH/eMmvn4C5h1/wwNezEw0F3yK bCEZ4KOimyHMk74TgVLyHprQKD02hgpgGtzX36g131C6bOXbReTL2XOvR9GiLzbg == 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=bEXZaw5K 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=bEXZaw5K 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 S932414AbeAXERb (ORCPT ); Tue, 23 Jan 2018 23:17:31 -0500 Received: from mail-sn1nam02on0108.outbound.protection.outlook.com ([104.47.36.108]:12096 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932860AbeAXER1 (ORCPT ); Tue, 23 Jan 2018 23:17:27 -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.9 27/55] nfsd: Ensure we check stateid validity in the seqid operation checks Thread-Topic: [PATCH AUTOSEL for 4.9 27/55] nfsd: Ensure we check stateid validity in the seqid operation checks Thread-Index: AQHTlMoAOMpWIgXW+kKrDhMdfQHL6Q== Date: Wed, 24 Jan 2018 04:15:42 +0000 Message-ID: <20180124041521.32223-27-alexander.levin@microsoft.com> References: <20180124041521.32223-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041521.32223-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;DM5PR2101MB0933;7:mk76J6AJ93av2Io1DXADVJHHnf55yyyfS7wWhGhld1VUdBNQNpw4MUAtOcllOjFBcFZuh3zaImY+G0SERVJOGWCiPXs21Cix4ga/sY+l/RhFHO+HNu54k9AmdXcn8JKIpdSNxEmg+7XOnjtv5S/Ez4y3ES+lFHalpwvKuWVZjkPZCV/S01nfl97HaKR7hc8kHc1Ld4tCxYpQXjmBliOXcqI3xope6YWJrzGgEise1JSf5C/L0ewI48VeeouKh4aN x-ms-office365-filtering-correlation-id: 8ba121de-b2dc-464b-bf4a-08d562e15ef2 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(48565401081)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603307)(7193020);SRVR:DM5PR2101MB0933; x-ms-traffictypediagnostic: DM5PR2101MB0933: 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)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231046)(2400081)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(6072148)(201708071742011);SRVR:DM5PR2101MB0933;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0933; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(39860400002)(376002)(366004)(39380400002)(396003)(189003)(199004)(105586002)(305945005)(478600001)(110136005)(10290500003)(76176011)(54906003)(106356001)(25786009)(66066001)(10090500001)(14454004)(3846002)(6116002)(1076002)(6346003)(97736004)(6506007)(5250100002)(2501003)(72206003)(59450400001)(4326008)(36756003)(3280700002)(3660700001)(102836004)(2906002)(5660300001)(53936002)(107886003)(2900100001)(6436002)(6512007)(99286004)(8936002)(68736007)(7736002)(86612001)(81156014)(575784001)(86362001)(2950100002)(26005)(81166006)(8676002)(22452003)(6486002)(316002)(6666003)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0933;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: B51BmVn7/2Oqp+SN/rZ4lBmAlsA/szgz7rts4SmLrHpADpc7cp/ipwLwq4AFOP3LikFQqFs4W+gkxuEdNxBkLQ== 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: 8ba121de-b2dc-464b-bf4a-08d562e15ef2 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:42.9355 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0933 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 fed5902099f5..7ab71933953e 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5182,15 +5182,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