From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516767753-2-14161503263960219127 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 enro, 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=1516767752; b=jXeSWoxtPXUN2ogchGqvnS9NUQ46u82VA228o3V5bDgfWmV MHGx4nR3QZreFBvPw141RokCBJDhiLRBnn92BbFcDzsg1wWyXQsjDBJxNcKnie0P vHsR2+3UzrZg07nPPT5VwfX7KldDFKBxF/VZLkXAJKfbdDSv2bPFyaNbIIQ4dTy/ tG7PJRZWvCtf7WCfvTi3kE4ML3adJ831uAuFK26CfJw4PXxyXXlPhn5iM93rIJMa LuOg4+bRjFDoidDXyzf1ir9vjbgVhpKptiLAmORN3FYVgI+eW3RMyhW+z6LnBE4X ktzkTgwgaQtudU0Y8jL+RnbyAzghWNLZmWHEYOQ== 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=1516767752; bh=s4kZHo 8lfUqKpm11avJq76t9f6k9WQ2nbDazw21UjEw=; b=pSCZk6XBxW1VAEJOMYXFwT U5bWaU4HOvv9ZzbXChFXvyUPi5m0D7OAugxA7b59sOXt88gj3PumEB4Ewvc7FPua yBTftzqmSxEvcEbpBtgCrfqs9GVI4s6roj/sFLg5ZXg2L5dHTeFVPHayqVTPSnDD e+m4DZO2EMPF+XZuzgVgzaberSukJBjcFVJpQjToEhnbv7GSJfat2dWgiC1h4YVt SlF7yWKAylUYFN2Y43bwGGgUt0al7bvHpszi0zzvlfMc5Ue+aFsOQd9koPlmmNgz dqIsActycc6oAmHcYs0mHaapOVJ78duZ0cVhkhKfUodB4O5x0JxtuSWTnFuhyY1Q == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=GfmsaVqd 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: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=GfmsaVqd 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 S933051AbeAXEWQ (ORCPT ); Tue, 23 Jan 2018 23:22:16 -0500 Received: from mail-cys01nam02on0093.outbound.protection.outlook.com ([104.47.37.93]:46352 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933312AbeAXEUI (ORCPT ); Tue, 23 Jan 2018 23:20:08 -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 3.18 08/16] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Thread-Topic: [PATCH AUTOSEL for 3.18 08/16] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Thread-Index: AQHTlMo9B2m9y4NWtUuin6ZIEJbFkg== Date: Wed, 24 Jan 2018 04:17:26 +0000 Message-ID: <20180124041716.32520-8-alexander.levin@microsoft.com> References: <20180124041716.32520-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041716.32520-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;DM5PR2101MB0872;6:Os6+/vPy0q7B5SXADd8ajfTk07O9JqgAjS4+CSQ5jzj43ZP164PPyXgEtOTQ3qUxyj87x7+Tw7VhVn3KI1NhSnCk47ofpUv+kCMnlJkEME/t+Z2Qf6AAXucSnitv4pHmcV9oLvGQGlcCypyH0OSvhww/wgDXBWyeI8aZarlCVYM5Qjc8x2PbVEbMcuhd+L0bd++YgPf0Mn1Efhdg3kbxKwcjthjgQHBEIKVZAs4iFCCiizr1OY9Z4QPdlWoGbWsXd7lusINsmp7inAHM69XaJA2dH8knhYMMhqI2JD/coVXq1uxI3IT6+c9u64zacFKDYsk4wlaHAQ/R2yNRrVwF3ey2gsGrXW5Rvxey1BgqSsZjrthuIlZohR+mU7CRnyfx;5:jDEC2HrKFOAOoDsZsdVlDAcLqoVTquAAtRNlYZ992QZUNaglUn/FthhECIvrAMBfLbuQII4lJfsUGvMFPOSVDDz2xx5P+cYmCh7M+oXEmEhg3oUzKzh9WP+7MC8QxHaxitySMKQgUCYM5ULAhtDlQ4pnuSrzdBrvfCdKqjjufrk=;24:9S6MrZgmnoWFpzO7J+1+lsANujGpVIMbqBn+EfyxArW1uI3VMxpfncs8PXtV+cFZR1qZpP3Kx6/Jmmx3VOFgNJp0EJtwdR7oY0w62Dghpy8=;7:CxqakikeKwicE3PWYtBtqhpLwe9JeTglZ/inaA+yrURTVLGf5gOZfS9s3jKrA2jvQr7x2AuaVPUZUcUHpOURtMNLB082pVW3SdT0PQYJwxP5Er4vtFziNX/cXvtUgtm55jAXBgnTEnM7rVQv/DFUYc2yBeZpqDguaH7eMuth8SNVkcS9CYR4GKl1k66/Xr/k6gHqf9R/cCDbMbObIxOU6gY1R6UuzG/G0jlKZob2sB80CYbyPVqEqFjjD9XzSnZn x-ms-office365-filtering-correlation-id: 02e12e1a-e58c-424a-6f36-08d562e1be4f 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:DM5PR2101MB0872; x-ms-traffictypediagnostic: DM5PR2101MB0872: 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)(93006095)(93001095)(3002001)(10201501046)(3231046)(2400081)(944501161)(6055026)(61426038)(61427038)(6041288)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011);SRVR:DM5PR2101MB0872;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0872; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39380400002)(396003)(366004)(346002)(376002)(39860400002)(199004)(189003)(5660300001)(106356001)(72206003)(3280700002)(5250100002)(66066001)(3660700001)(105586002)(14454004)(86612001)(478600001)(53936002)(2900100001)(10290500003)(2501003)(6512007)(10090500001)(6436002)(6506007)(36756003)(6116002)(3846002)(6486002)(2906002)(22452003)(107886003)(316002)(54906003)(4326008)(110136005)(6346003)(81166006)(25786009)(26005)(2950100002)(6666003)(86362001)(1076002)(8676002)(7736002)(81156014)(99286004)(59450400001)(305945005)(76176011)(68736007)(97736004)(102836004)(8936002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0872;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: 21iJ1ZC3K0LP0fXDJOTH5I3FIYlJC8ldtYFuZEoXI/OzM35+lrOgU12YCCEgFRehHacIKFDONHVlAE1odAoDkw== 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: 02e12e1a-e58c-424a-6f36-08d562e1be4f X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:17:26.8311 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0872 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 fb500a7cfee7f2f447d2bbf30cb59629feab6ac1 ] Signed-off-by: Trond Myklebust Signed-off-by: J. Bruce Fields Signed-off-by: Sasha Levin --- fs/nfsd/nfs4state.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index d59ce5a665d9..fc486e67db38 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -62,6 +62,9 @@ static const stateid_t zero_stateid =3D { static const stateid_t currentstateid =3D { .si_generation =3D 1, }; +static const stateid_t close_stateid =3D { + .si_generation =3D 0xffffffffU, +}; =20 static u64 current_sessionid =3D 1; =20 @@ -4901,6 +4904,11 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_com= pound_state *cstate, =20 nfsd4_close_open_stateid(stp); =20 + /* See RFC5661 sectionm 18.2.4 */ + if (stp->st_stid.sc_client->cl_minorversion) + memcpy(&close->cl_stateid, &close_stateid, + sizeof(close->cl_stateid)); + /* put reference from nfs4_preprocess_seqid_op */ nfs4_put_stid(&stp->st_stid); out: --=20 2.11.0