From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-901460-1516768795-2-5394184855289398683 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=1516768795; b=se6X3Uo3fefZvXMlN/UdWIsUHcewIe/k03jep1mD2QODYmR yfwrsiwVMlbQTK89mteHMitnpd/CqTlxgr5hEXXPDYNvOrtXr6SS/s7uvwupRv73 7f+gRhUXSaiRCAy2v7bpQv6BuorooAFTRMAaqD7vEq+RcGcxym2nuN/CBJf6S2b2 QYpN8Gyn9QS7BoFTBRomKoKto7ttXgqAlTXOL6XWlZoPOgwbQ/F30CWMcMOfVx1n Oqp3Nl+uUZ5KBCOW6bd9D2XF/jwWZdmsdiCXlzG7vgS1s7oGMMZ7zAbOczTAc5gP xLTIJhOg5L6DjiYPH7NZa6qWLq/Ig77GDVCiC5A== 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=1516768795; bh=vYjTLU IZoxp1MmLm1Bx2NpqKH/mhcKX6abs7TVUX7ac=; b=dbE0djLpdzt/FEZL1eBaqr 82aLyj463u5enyrF5qgf7wLmqj2AW1JVnVSFt3phAvFWxHoAeAwfkeQV4fOOdrSi fXd/Zf1EoUdInC/FrRFgnfp9g1yoZEYoTcKkO7eE6xd/ouF/OheR0nuqI88UQ8Nm /Pevx8GCSY1Dqal0ENjBJZZl0zbb8OY2n3xgDwMpgQqGCiilSIuHvQvGvrbj/dxK AR/Okl4W7HFRZP1B4bmTEHTca2eI84iUXtE/uRgEtIlErPECkJRtosyKIgdq++7r H/zFFiasYLZtrJtji7+c4BMxdl86A5AO6w83zQtDX0YZVTGuMlXPPB4p3/Psswgw == ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ntR1X0pw 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: mx5.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=ntR1X0pw 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 S932568AbeAXEjw (ORCPT ); Tue, 23 Jan 2018 23:39:52 -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 S932287AbeAXERZ (ORCPT ); Tue, 23 Jan 2018 23:17:25 -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 25/55] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Thread-Topic: [PATCH AUTOSEL for 4.9 25/55] nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0) Thread-Index: AQHTlMn/6+WEKu2M5Eef9+rGYGG0DA== Date: Wed, 24 Jan 2018 04:15:41 +0000 Message-ID: <20180124041521.32223-25-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;6:2fpXKSjmQWgEaXB0Crdq+CGH1b+v35j8mkC3neLbKS9oOiuDZeyQ2AsZ7W0yFCRmzaGDGtAcIoeHmURSbhh1Lm1E3GyY2g9Kg3b/hA7X4/BS3eT9WRhdnuuLFZkn8uMXHNT0LM1gpdrv2+Fr2FsklS9aiCXmo2lXnxrNnM4vIGTuxN4iv3mmg2pBSBSZtBGMIme0jOkxLoOgFJhqnTx7XOrn/8IXlU6Lj54w8G3TXMTnZ2c2Sx7Dr/SKfTbRShH761GuSdrMggcgoJ/IT2jCh2h6/HV0c5gIJtgHJq5cOwMmmQHpPsWt/YH8n+NXXhp6esYyXwj4A3deNJbFuHKlZtVpB5akCOmYmxaopKycrTlD5tHS+U5EysNVJ0eyis3O;5:pmfOx6hvWtxQENLfugtpnj8BmNtlv5UK/Es8xX6VRs67h/mk5m7zDzidYvmhe2AVYNcDh49FQIfB25IFl9vQY4tLQ1rcxRFu+MHtZyKyHplukraq/MI/8PiaR+dIXu+cuoJXCZkGKzP37d+D3RGY0iH02WCtoPwu8ZxYCYLL1eA=;24:69dPaIpL4yN9+ytp9S2QTU/+n0dAg/39OjOZ1UReaS80qcIVAQogXhZsqqupsWeeT+iJd4P9Dj3/oyYisqA3wQODYOwL7Axzxea/QZhxShQ=;7:NgZkPXmXHDhMDI6N3y5sOMrDuYDM0VMJGV96lcq+dqUhlx30YcV42McwVy2zNv2ShwZtINzNLip3JQn3GSQaFSkSRi2tYayt5GJmgL4EQxTMGI8RmmJFZrudhd9ts+KZ/Vr1P0PupOUeidOCJzFmJFpHZuSAlR3gY4FRMdXW25BhRyQm4jGOl6U5IlJOfqLmvOy9Lo4deMfaN6kzVjui3kzjU00jyLl0OOS7nEqLQyMIJRN5OduMH1sWdlo8ovju x-ms-office365-filtering-correlation-id: 3e2bcb96-4a64-4735-0d28-08d562e15e79 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)(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: dgnmasYxj3xbpdH5f2MfwpC02h6fWzhuclXT/qP13vcOEafGY44IYkr7hdTMHiVhi0CP6wP/KErE30TK4H48Wg== 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: 3e2bcb96-4a64-4735-0d28-08d562e15e79 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:41.8847 (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 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 9ebb2d7c8182..7f3a11ab4191 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 @@ -5407,6 +5410,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