Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp4122512ybe; Mon, 9 Sep 2019 04:42:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqy4NCezTnKmV0uBEDceZvLx7LzTT/W9FsGPiVPeYxGCbH6WTZvhxCYvhwjynIriEOeKrGxk X-Received: by 2002:a05:6402:7cd:: with SMTP id u13mr11353578edy.14.1568029330159; Mon, 09 Sep 2019 04:42:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568029330; cv=none; d=google.com; s=arc-20160816; b=CnSfXgbSxETpM3HcMjuXz+slA6/9ajcgi+jECMpbhXHlZBCmGXIoITBlusdtX8s9I/ b3IRu5KETGeDvt2oaSoaab944Clj7Esj8Cl5v0BvmDH5bkoJqbaTRQ8h7vYtpPm0Qml7 aK9jbqISOObNT7/OefZJt1mX3SeWhZJSsAe87z8U55+Wj3zHO1bjvnoLBuauwvceZCQg 86dZ7eAmRjVPZngqS14OusQVYtYb2aGTI+SZPL+LU+oOYg44sZwtxYjaM06vdu7N4wug xxtoLtc5H9MqEIZU1Cd72Wy9FaasvVZF8oV0VRP774WA0uq/WSPyjBhiWljWxDBDV3NQ RmaA== 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=ww+0Fc79NoLA8t/8iIaOyUvjyt9l4n5SIl2gpBPKaoU=; b=A7Ee1NrLVYK9GRy3BFnHyfi/KAa4x+MAQhylRemypOJZeKpfeCgnEbj7tAjG+yaZiR rzhVbWyM40vL8UNeqk6hsDz+v+E2xN7MKQuQobTjCoeyDOkFODnnArGMc63MNaSRHi8u 7Qw7B60vxjckfPs9J4jWTaqYh8XGAOyh7GMqqEYckN+/pSpNcx2CVgU6VXdjkpkC2sJk ZjB6jHI4x6RGeqM4MtyCB8kdSjYvCVdpyvY5O6U9MCKu5+kzzSmHMgScqRkyB2lpR0jH Zy1zM+Vh9UnNqKNk59m8kEbg/p7wM4CFDafhooIOQcg6j1ONunU7kTnCXVtHkgUbjs54 Dhxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=MI5SsQRU; 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 t14si7094379ejd.101.2019.09.09.04.41.46; Mon, 09 Sep 2019 04:42:10 -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=MI5SsQRU; 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 S1731154AbfIHMsp (ORCPT + 99 others); Sun, 8 Sep 2019 08:48:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:37948 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731111AbfIHMsl (ORCPT ); Sun, 8 Sep 2019 08:48:41 -0400 Received: from localhost (unknown [62.28.240.114]) (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 AD034218AC; Sun, 8 Sep 2019 12:48:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567946920; bh=uityAVRwDNDPCSvZmijXW7q0fKGGHgWvurgEnuRrBoc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MI5SsQRUrPkQeX4QWH29lXE0Hj4WM8ShfMSQkc+IPEotsxt4Ws00Rbjrcx2UsaN5g 7XCcAYqHIOBrmiZZO4LpeJrDJmkkSfH6BZsdftT9lSmXTqI4b2TKPnsUi3lDUk8W9S F7X908qbFjHDDFeeImH6gxLhPS+Te6+OYh8zEfxk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luis Henriques , Jeff Layton , Ilya Dryomov , Sasha Levin Subject: [PATCH 4.19 51/57] ceph: fix buffer free while holding i_ceph_lock in fill_inode() Date: Sun, 8 Sep 2019 13:42:15 +0100 Message-Id: <20190908121146.061100232@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190908121125.608195329@linuxfoundation.org> References: <20190908121125.608195329@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 [ Upstream commit af8a85a41734f37b67ba8ce69d56b685bee4ac48 ] Calling ceph_buffer_put() in fill_inode() may result in freeing the i_xattrs.blob buffer while holding the i_ceph_lock. This can be fixed by postponing the call until later, when the lock is released. The following backtrace was triggered by fstests generic/070. BUG: sleeping function called from invalid context at mm/vmalloc.c:2283 in_atomic(): 1, irqs_disabled(): 0, pid: 3852, name: kworker/0:4 6 locks held by kworker/0:4/3852: #0: 000000004270f6bb ((wq_completion)ceph-msgr){+.+.}, at: process_one_work+0x1b8/0x5f0 #1: 00000000eb420803 ((work_completion)(&(&con->work)->work)){+.+.}, at: process_one_work+0x1b8/0x5f0 #2: 00000000be1c53a4 (&s->s_mutex){+.+.}, at: dispatch+0x288/0x1476 #3: 00000000559cb958 (&mdsc->snap_rwsem){++++}, at: dispatch+0x2eb/0x1476 #4: 000000000d5ebbae (&req->r_fill_mutex){+.+.}, at: dispatch+0x2fc/0x1476 #5: 00000000a83d0514 (&(&ci->i_ceph_lock)->rlock){+.+.}, at: fill_inode.isra.0+0xf8/0xf70 CPU: 0 PID: 3852 Comm: kworker/0:4 Not tainted 5.2.0+ #441 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.1-0-ga5cab58-prebuilt.qemu.org 04/01/2014 Workqueue: ceph-msgr ceph_con_workfn Call Trace: dump_stack+0x67/0x90 ___might_sleep.cold+0x9f/0xb1 vfree+0x4b/0x60 ceph_buffer_release+0x1b/0x60 fill_inode.isra.0+0xa9b/0xf70 ceph_fill_trace+0x13b/0xc70 ? dispatch+0x2eb/0x1476 dispatch+0x320/0x1476 ? __mutex_unlock_slowpath+0x4d/0x2a0 ceph_con_workfn+0xc97/0x2ec0 ? process_one_work+0x1b8/0x5f0 process_one_work+0x244/0x5f0 worker_thread+0x4d/0x3e0 kthread+0x105/0x140 ? process_one_work+0x5f0/0x5f0 ? kthread_park+0x90/0x90 ret_from_fork+0x3a/0x50 Signed-off-by: Luis Henriques Reviewed-by: Jeff Layton Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- fs/ceph/inode.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index 3e518c2ae2bf9..11f19432a74c4 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -742,6 +742,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page, int issued, new_issued, info_caps; struct timespec64 mtime, atime, ctime; struct ceph_buffer *xattr_blob = NULL; + struct ceph_buffer *old_blob = NULL; struct ceph_string *pool_ns = NULL; struct ceph_cap *new_cap = NULL; int err = 0; @@ -878,7 +879,7 @@ static int fill_inode(struct inode *inode, struct page *locked_page, if ((ci->i_xattrs.version == 0 || !(issued & CEPH_CAP_XATTR_EXCL)) && le64_to_cpu(info->xattr_version) > ci->i_xattrs.version) { if (ci->i_xattrs.blob) - ceph_buffer_put(ci->i_xattrs.blob); + old_blob = ci->i_xattrs.blob; ci->i_xattrs.blob = xattr_blob; if (xattr_blob) memcpy(ci->i_xattrs.blob->vec.iov_base, @@ -1017,8 +1018,8 @@ static int fill_inode(struct inode *inode, struct page *locked_page, out: if (new_cap) ceph_put_cap(mdsc, new_cap); - if (xattr_blob) - ceph_buffer_put(xattr_blob); + ceph_buffer_put(old_blob); + ceph_buffer_put(xattr_blob); ceph_put_string(pool_ns); return err; } -- 2.20.1