Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3004684ybi; Mon, 17 Jun 2019 14:29:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqyAYmTqVKqsvv4fngH1yjLh0mt9DqXrJ9hmQRlBPHaLMQx+ju1Hv+XzGPhalfe5TgiH3uwe X-Received: by 2002:a17:902:4906:: with SMTP id u6mr111546635pld.220.1560806994720; Mon, 17 Jun 2019 14:29:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560806994; cv=none; d=google.com; s=arc-20160816; b=xAqolayJo0pbC/ay69sxy7NxSGUSspgVe/IcB6y7Hajmc5nmwOFnYlVblSV/X/Kv6G 3sx+nK+nDSUS5YQAPFCkHkmE1C7ElOc4BbtWe3sJssPDcJ6gWP+AgV/vUM6AFGxmhwoa Ux9kpQ0l6b/nPEve1MPjt0VvLNTGwnqeYG0CvEhFeoK/OCvC0BISENn4PrdzAxkqHNNu z83plUVxSxyiiUoEC7l0gFdr6tWLjMEJ+ODfg2aquaJfUK2jPE+x5pkNPJhAjCv1UvX6 rC70RdNLBkKnF8q0eokBs6I6GJkVB/yI4nkPa7vh9tj+nQbNT/gZYgGgMrN9bN6M4Uz9 bxKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4FlzNgwEc+uxst3dj9RrjcMsDpXYA2rx5RtLibAZ1SI=; b=SkPnEenxzGAVbElANtDjes4E5qF1jp0jiq2HWBelEwZUfeueUEecy+tCGc02i7AaOV MsDhzNLV11nQxPEgsL62Nklu9lmzpsdsSedmhPb/X0vGCBnTvy7kxOQ1BOrjbDp2GZNn RkuPzRJaRGGC3V6NPEqUt5Qpx9rVc/D+dQXtMBUrBNxNPA4YbF2MVMZh5lErhCra5n9N F6jj1j9bmhiPkYtTqfGzFOlbZ37yb7a4aM4IB4QD8sWbSlPn1qjN4LjdgwnFPaDotET3 /YseFf60+fmsN/MlCYHBrvFktJoA+RZXCpeI0Bqxp08TEs9opYBnYjtwpOEJOyOEG+MU x99Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qzcqSE+B; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 27si12945785pgn.43.2019.06.17.14.29.40; Mon, 17 Jun 2019 14:29:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=qzcqSE+B; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730454AbfFQV1v (ORCPT + 99 others); Mon, 17 Jun 2019 17:27:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:54844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729629AbfFQV1t (ORCPT ); Mon, 17 Jun 2019 17:27:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 B57B820861; Mon, 17 Jun 2019 21:27:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560806868; bh=z5SKF9DOlqPNls6ia41cYM6baailNmIznIbwfYklA1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qzcqSE+BSENPR4Ji6wiMvG5xLzfPL+MieeQAkt/xyRSBN67qYimAeXSmY08ryoeQ1 vWFCVYDtfIuVzC6T0xCldZge3fZSXIWcYZZphp8oSuprH8WG6X97PXFNfPF3zRQmzu +CsYyMuUx9FPs/m89ZDG6pi16RtrmpGTpbKwBpvw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wengang Wang , Daniel Sobe , Changwei Ge , Joseph Qi , Mark Fasheh , Joel Becker , Junxiao Bi , Gang He , Jun Piao , Andrew Morton , Linus Torvalds Subject: [PATCH 4.14 10/53] fs/ocfs2: fix race in ocfs2_dentry_attach_lock() Date: Mon, 17 Jun 2019 23:09:53 +0200 Message-Id: <20190617210747.205673636@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190617210745.104187490@linuxfoundation.org> References: <20190617210745.104187490@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wengang Wang commit be99ca2716972a712cde46092c54dee5e6192bf8 upstream. ocfs2_dentry_attach_lock() can be executed in parallel threads against the same dentry. Make that race safe. The race is like this: thread A thread B (A1) enter ocfs2_dentry_attach_lock, seeing dentry->d_fsdata is NULL, and no alias found by ocfs2_find_local_alias, so kmalloc a new ocfs2_dentry_lock structure to local variable "dl", dl1 ..... (B1) enter ocfs2_dentry_attach_lock, seeing dentry->d_fsdata is NULL, and no alias found by ocfs2_find_local_alias so kmalloc a new ocfs2_dentry_lock structure to local variable "dl", dl2. ...... (A2) set dentry->d_fsdata with dl1, call ocfs2_dentry_lock() and increase dl1->dl_lockres.l_ro_holders to 1 on success. ...... (B2) set dentry->d_fsdata with dl2 call ocfs2_dentry_lock() and increase dl2->dl_lockres.l_ro_holders to 1 on success. ...... (A3) call ocfs2_dentry_unlock() and decrease dl2->dl_lockres.l_ro_holders to 0 on success. .... (B3) call ocfs2_dentry_unlock(), decreasing dl2->dl_lockres.l_ro_holders, but see it's zero now, panic Link: http://lkml.kernel.org/r/20190529174636.22364-1-wen.gang.wang@oracle.com Signed-off-by: Wengang Wang Reported-by: Daniel Sobe Tested-by: Daniel Sobe Reviewed-by: Changwei Ge Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Cc: Gang He Cc: Jun Piao Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- fs/ocfs2/dcache.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) --- a/fs/ocfs2/dcache.c +++ b/fs/ocfs2/dcache.c @@ -310,6 +310,18 @@ int ocfs2_dentry_attach_lock(struct dent out_attach: spin_lock(&dentry_attach_lock); + if (unlikely(dentry->d_fsdata && !alias)) { + /* d_fsdata is set by a racing thread which is doing + * the same thing as this thread is doing. Leave the racing + * thread going ahead and we return here. + */ + spin_unlock(&dentry_attach_lock); + iput(dl->dl_inode); + ocfs2_lock_res_free(&dl->dl_lockres); + kfree(dl); + return 0; + } + dentry->d_fsdata = dl; dl->dl_count++; spin_unlock(&dentry_attach_lock);