From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZqIFQUWvHOucEoqAejPHnfD0x5TFG1udV1ZXWYVHGGi+WRVyQ467BELl1Mpx3DQBZBUE5VR ARC-Seal: i=1; a=rsa-sha256; t=1526280841; cv=none; d=google.com; s=arc-20160816; b=CnLMXxWJNkD2eGqsvgsQGNuBmoajryUXecmx4nkoNcWNV0l6VAKTj/Zyh0/1icXgZc KmaRlSY7jz6zV7Cr4gZKk2eRJ+mqWNdl1AE6pz9xnCXI0hagBMrP1EkupEMP2fcmOejS Kk3ZKeCtXs+txC5OoGzqscgAyWC01ceIdkihCy+/Gw/z5VK9bsLHl9aYTx/OJgrZhd8d r9RBveH+gxM6wxEIyvYEvXkotFEV3zm5am8hGkLtDcjsc+isVo8nSKII5AS68XqhuiP8 TwDIdDUNATtHEYqM/fIiPNCvrCTYkKqAZBOvm6f3GK7+PgefCa4oVYhy6LaUt+SuKIgD IjwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Si25NuTl6Jekk28W48CjLzhtxxdz4CflCOxl1586Mec=; b=mv2Ij0Dybb+J5TPI9TfJx911Q0FeT1KlXKcojjSpXEnSPtAzCA1t7K5hGVZQESVXrY xSaEVIA7htTxP2aNHXmRuSi8X5MZUQYoHi/VzdAPw/vQrOK0btkqStcFDeIQx6N1hGUb ug43Z7ZRZuN/ir71Bs9jYjojGJVR2GQKEdL2h3gEo95MRf1JtK97RJAqn/+zuukC5RaK 39qf6av9yfQ+KpjyIJ00iLE/4CvGko2IqIIghhXYzCqrttKypiaMvVwfDy7rlVJJvpXu 03LUgJFYkMgNhvF2Kaoxc3ded75uWB2J9x9JOgb1X+sxgID44uk7uDJCn7ja7SqNkLs3 Gz/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zudxGalS; spf=pass (google.com: domain of srs0=ywzk=ib=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zudxGalS; spf=pass (google.com: domain of srs0=ywzk=ib=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tetsuo Handa , Tejun Heo , syzbot , Dave Chinner , Jan Kara , Jens Axboe Subject: [PATCH 4.9 13/36] bdi: Fix oops in wb_workfn() Date: Mon, 14 May 2018 08:48:47 +0200 Message-Id: <20180514064805.274404524@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514064804.252823817@linuxfoundation.org> References: <20180514064804.252823817@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1600421358029134796?= X-GMAIL-MSGID: =?utf-8?q?1600421460054028766?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jan Kara commit b8b784958eccbf8f51ebeee65282ca3fd59ea391 upstream. Syzbot has reported that it can hit a NULL pointer dereference in wb_workfn() due to wb->bdi->dev being NULL. This indicates that wb_workfn() was called for an already unregistered bdi which should not happen as wb_shutdown() called from bdi_unregister() should make sure all pending writeback works are completed before bdi is unregistered. Except that wb_workfn() itself can requeue the work with: mod_delayed_work(bdi_wq, &wb->dwork, 0); and if this happens while wb_shutdown() is waiting in: flush_delayed_work(&wb->dwork); the dwork can get executed after wb_shutdown() has finished and bdi_unregister() has cleared wb->bdi->dev. Make wb_workfn() use wakeup_wb() for requeueing the work which takes all the necessary precautions against racing with bdi unregistration. CC: Tetsuo Handa CC: Tejun Heo Fixes: 839a8e8660b6777e7fe4e80af1a048aebe2b5977 Reported-by: syzbot Reviewed-by: Dave Chinner Signed-off-by: Jan Kara Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- fs/fs-writeback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -1942,7 +1942,7 @@ void wb_workfn(struct work_struct *work) } if (!list_empty(&wb->work_list)) - mod_delayed_work(bdi_wq, &wb->dwork, 0); + wb_wakeup(wb); else if (wb_has_dirty_io(wb) && dirty_writeback_interval) wb_wakeup_delayed(wb);