From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-901460-1516769742-2-3959119594146533158 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 enrosk.us-ascii, 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=1516769742; b=YvLbBMmJi1R2JrzBFfuYN8xajqJaVcucUGkwepFAOIDLUgt Kf3hxqgmx+4ho1gxJIqSlmUu7/0Tyqv6Xu/4xMcMBU6vZ69UW877sGWIY9Zgyujf WW9Ql0WxF9f7w7L0qBteHP9YwrQ7jrTapJTqeGJQQ2XS/DLAAxENuoRkAHH9+HvU uuYI7UFmXHUp6WzY7DvXAGr3MLEx3wzVFIIRNxs2PZfQPlDFd5u3V4juCDGTp3NU T9bRipCpO8kW7Je06bJHDzJnSnqKFbgGDeVOnsyvloDuw/6Hv3KUdz1CVPDPP0Io 77a8AyCUWVN7lWCPMC7tyl+/tevBsf/b7DwegIg== 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=1516769742; bh=kwrM+H G2cRi2H5Cb/6XUi9/87P7tCwrrTue2KR/UnlA=; b=Jo6dWJCfBhFHYr0doaw5iD DNY5q9srpzalUAgAeRdPMU20M5pn9vXB/l/IEmKWjBXneAoUb/OB+ZIDOkZBcQo1 CbdcJji7XXu9Yc7oClihS+uOBUf/ijhlsOTQ0ZyrmXRO1OJuBoanIDkGurlwFEJ1 jFT9KCszikT3D4EiBg5I2ZtdU4l77HfgoIxQB99u2p1i9bM5LIQxaBgvLhytcC6h OuWHcp9oMZIg511G+CooaF+7FyOc7r3DrtfV+X7W/yi5reybVrQP9mKHNRhuXVYE dvsvi6C2tWiW3A/127KaFLO0t51dIwljWMQvE1HymHeE/AqQp2CSzRCrY5oEsIqA == ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Ita4b36f 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: mx2.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=Ita4b36f 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 S932499AbeAXEzR (ORCPT ); Tue, 23 Jan 2018 23:55:17 -0500 Received: from mail-dm3nam03on0107.outbound.protection.outlook.com ([104.47.41.107]:39081 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932218AbeAXEP0 (ORCPT ); Tue, 23 Jan 2018 23:15:26 -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.14 056/100] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Thread-Topic: [PATCH AUTOSEL for 4.14 056/100] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Thread-Index: AQHTlMni5GhZqnxJJkuCFP3LOY0PEw== Date: Wed, 24 Jan 2018 04:14:53 +0000 Message-ID: <20180124041414.32065-56-alexander.levin@microsoft.com> References: <20180124041414.32065-1-alexander.levin@microsoft.com> In-Reply-To: <20180124041414.32065-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;DM5PR2101MB1015;6:hty2TVV2DqvZf+IOu1z4Ts0WIn+5XL2NMxEB6FPZ04RJyuHzWSCcHO9TVk9Bwa/0JMU2Q+Mjrr+bOkQBrbZGdkjoesepQqNnq06KHkhCk3x++kQqTnNHjqJZ6K1lvpjIwvVXm3SnaglstqIhHAhWq2zlrh0yuqjXIrYztqzTOR+34T3uBXGMd2+a2r5fNN0Jp5HSLwgCMYMFue1UqNNK9H7NjT63t07oRz3YznQAe8R5iAoctMeYstBQksgPkzN0Xq7QHiCJOuO85rq9BI3DO3kWnM/FdcUHCE6Kcezdy9pCrVLEHy89vsxNhaG2G+cDDr3pQ3Z6N5HWdtp7hRdfdZ7PjE3O3Q5kfQpj8/cEX9IheQblOph/QjuFddnY59+7;5:Yx2mbTvuGwwIvvZTX6mf1JoZRvnEqibzUPrmt/Afk2jC3mbv4CscFVyOWH3JAcfYPJzSu400GSjkhhyHc8XeWLVHDg1TrbyG0MbGV4d69zMZNqnrjX0Gs4NOzR1SuWWrzsqKonaO3HRU+sWLICzUe8+RxLvI57rUf2nQHg2awQc=;24:+cT/deCM5j8vW3P4GTnjDiWjCdN0arGRCZwHBoe45PnFlxL/ngYAQUG8QUN7GBD6Tpk5FTnUn5yIHtrXmAy0O73dJweF0gbEGs2pHRwuM90=;7:aVApAtiJdb8tloTeAH7Cp6S8tUWUiLZcNBzGTCkS2Z170rntvd19pyAXd9zlf5hXauuzVDrNjigeJYhOp6YRekh+R0sSZk+xGDfIw38Q3XIJ9wCbUxz+hMvvczEOqpEXVrHBpjkhmehYJPgQJCG1o3TECPXKU5mEhsIyxl8gqCe/c1bN305ayRBrw9helFLUsHaw5ZMOarz5gU5CJG/UrUJi9cYPiZkU9rLSIo4f1DVfC+O0y+eGNG8EqsdZEf/R x-ms-office365-filtering-correlation-id: 9422ddba-65d2-4daf-76ac-08d562e11501 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:DM5PR2101MB1015; x-ms-traffictypediagnostic: DM5PR2101MB1015: 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)(3002001)(10201501046)(3231046)(2400081)(944501161)(93006095)(93001095)(6055026)(61426038)(61427038)(6041288)(20161123558120)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB1015;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1015; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(396003)(39380400002)(376002)(366004)(39860400002)(346002)(199004)(189003)(478600001)(6666003)(106356001)(6512007)(53936002)(2900100001)(36756003)(102836004)(2950100002)(2501003)(10290500003)(97736004)(14454004)(81166006)(72206003)(8936002)(6486002)(1076002)(10090500001)(6346003)(26005)(54906003)(4326008)(76176011)(99286004)(86362001)(3660700001)(105586002)(6116002)(8676002)(68736007)(22452003)(66066001)(25786009)(6506007)(5660300001)(305945005)(59450400001)(7736002)(3280700002)(5250100002)(2906002)(107886003)(86612001)(6436002)(316002)(81156014)(3846002)(110136005)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1015;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: pVXZbjysKP/w7qkHFxlQ7NNbL8UzxaSNPbsKyYwynALCUmKXql7BJiScGrPAwvGflllGrqPGpENGk7zGEvx2jw== 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: 9422ddba-65d2-4daf-76ac-08d562e11501 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:53.0651 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1015 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 a439a70177a4..61f38346ce9d 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 @@ -5411,6 +5414,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