From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-901460-1516768786-3-1645681725951847276 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 en, 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=1516768786; b=Do5a5rtXDjUjO6AVwqUx06tMwKFZ+6l1ZJWHpCxObEoi6WT XWf6+jMAvKpYpGHm3T7u2TlssSiTkXOuki6ZxZurx8bu5GaPcTLFDsAPeEAOd1E1 PTFCDXXBSJfpQqANtbTMMoFDtsnFbxz3gsSTnjW5Yl8NX2SZaAQMCWpkJf01w6g3 6DPG5wUwrGxTw0U0zUQ/okUo+EFREt9DUxe5t4bwdMsAK+JHSPJynzHnxQeu42Pm bVbi/CUbBhoVFVzUmA6gbdY3esPpaStpB4J9RF0z3cHN163IFYIzqmwxxU300aDt PGo9dgU/rBZvG83QBAx/vdGhhLFbArkSWrCWm+w== 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=1516768786; bh=aBKUec 5vK+stlKVj165xwY38ineNIDdKEgSXue8tg4o=; b=OyLkXzDTF1BTvz5OXWkGDp KZPn7iglCQxGxau77EIx/1PQpVHAoHWqv0uogg21r3bxfJDEXBA/IAoLo6H0uS9L GY3lP747Ea9/UwwnNKw2FwrxhcGoXTeBQi95RHTQEL4xUPJ3kkrKXT/xj6SSJoI7 VB6vpr1SVX4cj2r4ZFthTNKtCUgVNAFRfbF1hoWgGPltTn+bjHYDVrcF/8DMBswO kGLxzKL1QAwl1vNKvnmIwb3llRru+0g2qWNYCBCZ8HPkjk5c9ZRjhdtB1wZ7beWC PYV95BEBNLIJXcpzipLAYUCeXvkg7qcwrGZh+hib1/yXqCqHctKVlybRqR1QDvUA == ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=BHcnAg4H 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: mx1.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=BHcnAg4H 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 S932564AbeAXEja (ORCPT ); Tue, 23 Jan 2018 23:39:30 -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 S932858AbeAXER0 (ORCPT ); Tue, 23 Jan 2018 23:17: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.9 26/55] nfsd: Ensure we don't recognise lock stateids after freeing them Thread-Topic: [PATCH AUTOSEL for 4.9 26/55] nfsd: Ensure we don't recognise lock stateids after freeing them Thread-Index: AQHTlMn/3CAkE/PsoEW4ZBnfqG+p3Q== Date: Wed, 24 Jan 2018 04:15:42 +0000 Message-ID: <20180124041521.32223-26-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;7:5ptivLzrlcvBJklnQyIeO7l4zDJKxi3QRcGnRK89Wp3IR/ugVEI1/3sq7dsmlIwljAKvloxO+ItTQOeEnEWkt02DKR2yOes2SdvQ6M47SRN7kM05DEUzucYE4NqqtWDlXvw75GMUv+wBa8KnN1cHYYXi+pUxOTFNnrh4ZG9dH8mHcLGR/I5nohIt4+fPVf2VdKEYVSBYkxtD4Byor4x8MaT/6yiJYH6YK83vv1IxqL3RZsowj5d9KccFpesDDvo1 x-ms-office365-filtering-correlation-id: 94e84ad2-065d-43cb-b961-08d562e15eb8 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: xy0oA8c0t2m1kJvI8JqLQamz0yYcmm7IgwkBf3ULRtng7VfI0ErjAKdBiiopEuySpTVl1EivFoRLWid+46LNpw== 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: 94e84ad2-065d-43cb-b961-08d562e15eb8 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:42.4161 (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 659aefb68eca28ba9aa482a9fc64de107332e256 ] In order to deal with lookup races, nfsd4_free_lock_stateid() needs to be able to signal to other stateful functions that the lock stateid is no longer valid. Right now, nfsd_lock() will check whether or not an existing stateid is still hashed, but only in the "new lock" path. To ensure the stateid invalidation is also recognised by the "existing lock= " path, and also by a second call to nfsd4_free_lock_stateid() itself, we can change the type to NFS4_CLOSED_STID under the stp->st_mutex. Signed-off-by: Trond Myklebust Signed-off-by: J. Bruce Fields Signed-off-by: Sasha Levin --- fs/nfsd/nfs4state.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 7f3a11ab4191..fed5902099f5 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -5098,7 +5098,9 @@ nfsd4_free_lock_stateid(stateid_t *stateid, struct nf= s4_stid *s) struct nfs4_ol_stateid *stp =3D openlockstateid(s); __be32 ret; =20 - mutex_lock(&stp->st_mutex); + ret =3D nfsd4_lock_ol_stateid(stp); + if (ret) + goto out_put_stid; =20 ret =3D check_stateid_generation(stateid, &s->sc_stateid, 1); if (ret) @@ -5109,11 +5111,13 @@ nfsd4_free_lock_stateid(stateid_t *stateid, struct = nfs4_stid *s) lockowner(stp->st_stateowner))) goto out; =20 + stp->st_stid.sc_type =3D NFS4_CLOSED_STID; release_lock_stateid(stp); ret =3D nfs_ok; =20 out: mutex_unlock(&stp->st_mutex); +out_put_stid: nfs4_put_stid(s); return ret; } @@ -5678,6 +5682,8 @@ find_lock_stateid(struct nfs4_lockowner *lo, struct n= fs4_file *fp) lockdep_assert_held(&clp->cl_lock); =20 list_for_each_entry(lst, &lo->lo_owner.so_stateids, st_perstateowner) { + if (lst->st_stid.sc_type !=3D NFS4_LOCK_STID) + continue; if (lst->st_stid.sc_file =3D=3D fp) { atomic_inc(&lst->st_stid.sc_count); return lst; @@ -5752,7 +5758,6 @@ lookup_or_create_lock_state(struct nfsd4_compound_sta= te *cstate, struct nfs4_lockowner *lo; struct nfs4_ol_stateid *lst; unsigned int strhashval; - bool hashed; =20 lo =3D find_lockowner_str(cl, &lock->lk_new_owner); if (!lo) { @@ -5775,15 +5780,7 @@ retry: goto out; } =20 - mutex_lock(&lst->st_mutex); - - /* See if it's still hashed to avoid race with FREE_STATEID */ - spin_lock(&cl->cl_lock); - hashed =3D !list_empty(&lst->st_perfile); - spin_unlock(&cl->cl_lock); - - if (!hashed) { - mutex_unlock(&lst->st_mutex); + if (nfsd4_lock_ol_stateid(lst) !=3D nfs_ok) { nfs4_put_stid(&lst->st_stid); goto retry; } --=20 2.11.0