Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp342995pxb; Thu, 12 Nov 2020 05:25:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJxrp7DZVgcv7/k1uGZOZgT4Mt1BkY9cqIyKGBDA8ajbjll5EiPLnA0QMhGAjS46lXoT/YFG X-Received: by 2002:aa7:c50e:: with SMTP id o14mr5141824edq.80.1605187556431; Thu, 12 Nov 2020 05:25:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605187556; cv=none; d=google.com; s=arc-20160816; b=lRezV98f7F0197oNbrvUNnb3M2YkzqDfLqSk7GQP11vSJSzHBnPstbaE8nfUC6SHT0 QSXbqwYQGT56DZFziId3g0RDfQh/qZOADiGLBc/6+FSg7sf2RdRbI+Py+B02Vc/4rfyC 4LYuwlnqgU5GhzC8heoibH5C4KyaHsmN1XjwcHTllKnjo8opxEDBWUXKyxOUMTO3BCJn z+XDlH3aZFB6zTlSGk2UWjwdV9j5+7jXIpALtVxOkrZhWGQ2uU7ZW3YreJdw1wai9jI0 VDRN27imi8seVL7SIi01+U/4Bj7SLVjc1p5UPJ33b8KGkk6SCdvd6Gazg5nw3IfdY8A/ TK1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:date:cc:to:from:subject :message-id:dkim-signature; bh=1xBRBHJ9mDmF7GglvO0Z4h4wTc6B5DTBTEQ/p6eyi2M=; b=FJxdmuauGbGjW8+eUzTXhTIGI+np1bdPaCOysAIJFxCrdPvdTW+aiq75fALrgjAHOJ PtZ9J5bdJ6K9mv0Xv2TSepIhDcpObg1FMIrWv8vL2dSSalSdB4iBksE2puuyL1kqxWC8 Iqt1hkU7MkVWlG7vDvx6vVuiasjrtOAld+Wldwssqt6oaFc5+vCqeEy5cRi9GwM3f68d 06ws1rzYqh/AHCLI2e7VhOF32dtK2N/CVYCOrRlnbrq8JkfEIG5r/a19KkogljpGxrP0 915WfyfNbdGf2CjBOmZlf1tMBmIel+jj7nqEjrolaBluzujjFCsI8yuqlDjvvnwJ07fV cvtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TWJa+JBd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n25si3907377eda.43.2020.11.12.05.25.33; Thu, 12 Nov 2020 05:25:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=TWJa+JBd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728285AbgKLNWG (ORCPT + 99 others); Thu, 12 Nov 2020 08:22:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:54204 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727646AbgKLNWF (ORCPT ); Thu, 12 Nov 2020 08:22:05 -0500 Received: from tleilax.poochiereds.net (68-20-15-154.lightspeed.rlghnc.sbcglobal.net [68.20.15.154]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3097D22201; Thu, 12 Nov 2020 13:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605187324; bh=E03FFk10N59RLyLQTqGfmVdga98+suTAIqgHYMBC3Mo=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=TWJa+JBdlE7HgqNQbOvPjNK2xscH2t3RGe207eeU8sPLUUhkrR1FsvOR1/fOsGC4y BFJO9+b7zN90OEXAPfmvu3S/fWd7D9mdh1GPhg35k0BCrwYxOgxhjWHXE/sECLH+c5 2bbXclKRGWIxrpZ+taFYcUfHtv4yTMNMrBhbyGiU= Message-ID: <2e81958e92563a568f2b9b5b4d23c4c7bab52f1c.camel@kernel.org> Subject: Re: [PATCH] ceph: fix race in concurrent __ceph_remove_cap invocations From: Jeff Layton To: "Yan, Zheng" , Luis Henriques Cc: Ilya Dryomov , ceph-devel , Linux Kernel Mailing List Date: Thu, 12 Nov 2020 08:22:02 -0500 In-Reply-To: References: <20201112104512.17472-1-lhenriques@suse.de> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.38.1 (3.38.1-1.fc33) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2020-11-12 at 20:43 +0800, Yan, Zheng wrote: > On Thu, Nov 12, 2020 at 6:48 PM Luis Henriques wrote: > > > > A NULL pointer dereference may occur in __ceph_remove_cap with some of the > > callbacks used in ceph_iterate_session_caps, namely trim_caps_cb and > > remove_session_caps_cb. These aren't protected against the concurrent > > execution of __ceph_remove_cap. > > > > they are protected by session mutex, never get executed concurrently > Maybe not concurrently with one another, but the s_mutex is _not_ held when __ceph_remove_caps is called from ceph_evict_inode. We can't rely on it to protect this. > > Since the callers of this function hold the i_ceph_lock, the fix is simply > > a matter of returning immediately if caps->ci is NULL. > > > > Based on a patch from Jeff Layton. > > > > Cc: stable@vger.kernel.org > > URL: https://tracker.ceph.com/issues/43272 > > Link: https://www.spinics.net/lists/ceph-devel/msg47064.html > > Signed-off-by: Luis Henriques > > --- > >  fs/ceph/caps.c | 11 +++++++++-- > >  1 file changed, 9 insertions(+), 2 deletions(-) > > > > diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c > > index ded4229c314a..443f164760d5 100644 > > --- a/fs/ceph/caps.c > > +++ b/fs/ceph/caps.c > > @@ -1140,12 +1140,19 @@ void __ceph_remove_cap(struct ceph_cap *cap, bool queue_release) > >  { > >         struct ceph_mds_session *session = cap->session; > >         struct ceph_inode_info *ci = cap->ci; > > - struct ceph_mds_client *mdsc = > > - ceph_sb_to_client(ci->vfs_inode.i_sb)->mdsc; > > + struct ceph_mds_client *mdsc; > >         int removed = 0; > > > > + /* 'ci' being NULL means he remove have already occurred */ > > + if (!ci) { > > + dout("%s: cap inode is NULL\n", __func__); > > + return; > > + } > > + > >         dout("__ceph_remove_cap %p from %p\n", cap, &ci->vfs_inode); > > > > + mdsc = ceph_inode_to_client(&ci->vfs_inode)->mdsc; > > + > >         /* remove from inode's cap rbtree, and clear auth cap */ > >         rb_erase(&cap->ci_node, &ci->i_caps); > >         if (ci->i_auth_cap == cap) { -- Jeff Layton