From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-858731-1516767336-2-14435680059688928939 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 unknown, 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=1516767336; b=W0Fts+a84zWqFmLxXnQHW2jQWLDErPSlwSUmKM0zDf2TSTC ffUGHVkR9G24W68MziXrB8fAuDubIGhpIgTg4DXlQlDJaEX81pXzv1u0UjMyvx80 sXg3srnyM7+4tFujwQ8OKht/zht7JQsUthKio8WR9dCNsFOkvfpyrkhu40x1DXCw pXzbMduAV74jrEhNpoe6zjZtHFIoWzFrHsjK8irTWXdFLpdxWGL3BV9+Ae5KdkiU e7ZP1fI3EARTKSa2qfJQXiOoJKMj0fxLDEQ02LSe5mLpriCJBnI+I9NCrLB8syWN 6xOfeXnTuliGuXtyFlz+/uMbN3FLS46fBkl0dMA== 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=1516767336; bh=Yvw7sn BZZesLJ8xtixA7JkC0v03oRZJQ0xiZcjtpmCM=; b=F2nAirVhrcdA5Ex9dszXoZ ikS317/xBCeK1cPZm+K5lqGJuiBQO7x9xYN0AHDRrgg7MxnpwZhg9oUV5aeNcEE0 YMp0NDFVAv5E9Ac4Xpc/7nSpiAudutGqdCEJmsPLFpwuTapc+Qyh+qmHG22qWZvb HpgdBhCfq82iYmwAsbxeF/ohp1SaxukZqQMR42vmZsp1wIGZCg+IyKVAqulktFaq OlTXggB98WMGwLM3ecSpMQLQiwBGWLyb2St/oX0/GfCMTajpqvlHVM2T+ba1Av/j YodXu5mIRdUU9MFd7NPRc5Etzf6i8yFm7ChZdJAqHWjhD5ZQtUUnkQTwnkVMTpNQ == 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=jpkn+MMn 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=jpkn+MMn 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 S932282AbeAXEPd (ORCPT ); Tue, 23 Jan 2018 23:15:33 -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 S932246AbeAXEP2 (ORCPT ); Tue, 23 Jan 2018 23:15:28 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Andrew Elble , "J . Bruce Fields" , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 060/100] nfsd: check for use of the closed special stateid Thread-Topic: [PATCH AUTOSEL for 4.14 060/100] nfsd: check for use of the closed special stateid Thread-Index: AQHTlMnjXtgB5y9h2kKHrZL0U+j+Yg== Date: Wed, 24 Jan 2018 04:14:55 +0000 Message-ID: <20180124041414.32065-60-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;7:36RB7GYyIpMo6XpWQ5PoNkjo7eqC2ssOsDCM7POr7SlPt7rgOLqsWUhuMwazA1UZ4dGqnsER5A9E+WArk+H/6ATJ/cPYUiWzeNsQM7ykYE2r7vK+Lf+Eu3oXJodjvSK0e9o2BJPlnp87SZBDCBYlihA2E0BfdNoqwb2ZNTXuRKLCTpyc1kearkixmuKa4i5ziWtfPPqt9HrzQk62l4dX617ZOJLBUxCGwmMBYMo+vG1NY/Hh1EoFuEPHQCUbJW4w x-ms-office365-filtering-correlation-id: 98e37153-701e-41dc-311c-08d562e11662 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)(575784001)(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: J2xyEDAyaLY5kc6zvKt9qHtVCfb7I542adaHx260LtlyGqg4MKSDQ8z+OFrstby4CB1EYNYHMqB/92qbGsHp/A== 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: 98e37153-701e-41dc-311c-08d562e11662 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:14:55.2887 (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: Andrew Elble [ Upstream commit ae254dac721d44c0bfebe2795df87459e2e88219 ] Prevent the use of the closed (invalid) special stateid by clients. Signed-off-by: Andrew Elble Signed-off-by: J. Bruce Fields Signed-off-by: Sasha Levin --- fs/nfsd/nfs4state.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index c927dbc8f490..cc74fb0dc02d 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -72,6 +72,7 @@ static u64 current_sessionid =3D 1; #define ZERO_STATEID(stateid) (!memcmp((stateid), &zero_stateid, sizeof(st= ateid_t))) #define ONE_STATEID(stateid) (!memcmp((stateid), &one_stateid, sizeof(sta= teid_t))) #define CURRENT_STATEID(stateid) (!memcmp((stateid), ¤tstateid, size= of(stateid_t))) +#define CLOSE_STATEID(stateid) (!memcmp((stateid), &close_stateid, sizeof= (stateid_t))) =20 /* forward declarations */ static bool check_for_locks(struct nfs4_file *fp, struct nfs4_lockowner *l= owner); @@ -4869,7 +4870,8 @@ static __be32 nfsd4_validate_stateid(struct nfs4_clie= nt *cl, stateid_t *stateid) struct nfs4_stid *s; __be32 status =3D nfserr_bad_stateid; =20 - if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) + if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) || + CLOSE_STATEID(stateid)) return status; /* Client debugging aid. */ if (!same_clid(&stateid->si_opaque.so_clid, &cl->cl_clientid)) { @@ -4927,7 +4929,8 @@ nfsd4_lookup_stateid(struct nfsd4_compound_state *cst= ate, else if (typemask & NFS4_DELEG_STID) typemask |=3D NFS4_REVOKED_DELEG_STID; =20 - if (ZERO_STATEID(stateid) || ONE_STATEID(stateid)) + if (ZERO_STATEID(stateid) || ONE_STATEID(stateid) || + CLOSE_STATEID(stateid)) return nfserr_bad_stateid; status =3D lookup_clientid(&stateid->si_opaque.so_clid, cstate, nn); if (status =3D=3D nfserr_stale_clientid) { --=20 2.11.0