From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516768124-2-998801475146528908 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 ensk.us-asciiro, 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=1516768124; b=r2Ho+lUlESlZMbVlZe5EDDy6iehhYakC0Azs0HMHJ1CBwAS oTApn9wQNoKU/A5DEmtuoA5zSrytbMgfE98AnVXZfEdlWTfJBeofxm1ksijZ9WcI wHd4Kx08g6IU1n+81D4iLYakLOew2jUxN9shsxdWdORWQ1Ws4xKOtxfAH8j98ieb oL8xGWaR5dgbDJkN89T8+B4crfCEqNC639OYxQEsCpb1pTSqWbunarokC7SPebrn NQDzsDXiaCVO6DIpXQSlUNL+2DjoDmx++mBH9XjGKLEG7CX2yMpyslgzdRasLEUL FLprNFnaBkfIAhtYHZ4lHDzcvW54Wy6igCI2Xsw== 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=1516768124; bh=LFg1c+ QSLf4P9Hukep4DBTXVrWjHTtvPpjH0qtMpZrg=; b=rZ8FOpJGmCT39uVC2NCSwp 8EiFRQ2D0BNEBY7xj1AU57NFLvQMDHV84NLXjauh8JTd5nnnC427jmL3XbBoSoBn 0dee8NAAkz53e/B2g64Z3a7XWZezoHmJ3VaoTCeivbKqZ769u1ptKz5THaXpOq+V BsW7WC2z2e78Gd/limti7yfmxUIriQcc09sJVEYgngsN8qN71T3mtvCiNE5rEp+9 D/VuE2VFTVLuZk7Wll0jaP6FhrF0fz3sqasAu+6tO0p2qC0P4hoe7iGhxYdAOK9x a5uMk2Ts5Y9tM+Hxm4ZRUebO1gREQc2+uBKcHMbELLiBCC55JWmZQ8FanwcgC9Jw == 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=GIPHvQ22 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=GIPHvQ22 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 S1752521AbeAXE23 (ORCPT ); Tue, 23 Jan 2018 23:28:29 -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 S933204AbeAXET1 (ORCPT ); Tue, 23 Jan 2018 23:19: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.4 18/35] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Thread-Topic: [PATCH AUTOSEL for 4.4 18/35] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Thread-Index: AQHTlMouDJjgsUYlj0eAWv58Cd8Bdw== Date: Wed, 24 Jan 2018 04:17:01 +0000 Message-ID: <20180124041645.32420-18-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;6:A/D+bdkeDfm2XUuKYENzsPP+3qoj2kHGs2W1bl7rIhE2w/FJF8iiDaLqhmG57a+knBVtVRMguBJ2KVUKzsQ+iW5N8HaKQOgvpy5BiWW9eXKQyRofgD2FMCUINlVMmU45AhMwvC+gla9jd7v4L28A9Y17ULyraliEP+pOe65Wg18YaumkVQdVs/5efTG22h+w8JQJA3S7cojq48rZNXapa/F7nig07vNCR4phr7iD0AUdOVUNAVCB2h2w969Lqc+u5kvPxISzpVaGJ+8SJvSeHpyyHO6CmfCXhZWbdaeVuBHKCfiW+nZshMACBFaLhIjVBey6V2E8VgYAyuuYQLzlJ+Kvd2ShBE788Y8EAXmu4ZGJWjfTUpCHXyST4+rvpZjm;5:5qV6B+daQ/MpJlSR4RIwFVYCk5VsoxYe5I3laJp6Vu/HSA5DRqXJVvkcCPL5xGSbl/Eg8UqkKaZn3O4SkS13lwi5VMMZ8k8MuskyXpTXzT2BgmiwTbiMgxI7sjc/xIIuP8ENWffTkjEsPF/bxnFX563oKoDo4I8lWzFWIncl9N0=;24:tZtkVAK6gXIEStcKx8m+VhvuXob7aZ1WRpgX4AeN26raoUu93LbkfvDQE+DsIzKTvh0dEY/gSujN8WI0aC9dlv86sIPAvzSxRzfqdITRVWA=;7:tZAKczW2+nSPNo0JyYyN1W1/LfKKLa0//4ekDC9PBDvjcKm+9CUUlMu/ErQilEej+9+U99qHmu+OfjoUXjUitQWh+pQDh8keL6Bj64v0hX3kVjKg/GLFkHpRraHkag8fwlMQj/65f6/H7G6Rcd7Hyzyn2DkfqASFzr9cFSrfEyZ7k1KOqlkpcrbukomMjXcjnmgn9ZJztyL3nqQAkp0m85UjkADFcATz1GWPpKFrck4lFbXHUv+44CrmpRB0S1xM x-ms-office365-filtering-correlation-id: e5b0ce48-d3e3-4fb4-9ed6-08d562e1a528 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)(979002)(346002)(376002)(396003)(366004)(39860400002)(39380400002)(199004)(189003)(14454004)(99286004)(10090500001)(2906002)(86612001)(2900100001)(2950100002)(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)(969003)(989001)(999001)(1009001)(1019001);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: 2D5Bn4mYEKPr+kn712EL2Yej/oV28dcCze5KZLErI89UkfGMxPngNSuR/Au0lc2SrAhcHmRSoboufD0cyRzD3w== 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: e5b0ce48-d3e3-4fb4-9ed6-08d562e1a528 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:17:01.5768 (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 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 11c67e8b939d..d31b6cdefb9d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -63,6 +63,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 @@ -5243,6 +5246,11 @@ nfsd4_close(struct svc_rqst *rqstp, struct nfsd4_com= pound_state *cstate, nfsd4_close_open_stateid(stp); mutex_unlock(&stp->st_mutex); =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