Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e599bfe5 authored by Coly Li's avatar Coly Li Committed by Greg Kroah-Hartman
Browse files

bcache: only set BCACHE_DEV_WB_RUNNING when cached device attached



commit 1f0ffa67349c56ea54c03ccfd1e073c990e7411e upstream.

When people set a writeback percent via sysfs file,
  /sys/block/bcache<N>/bcache/writeback_percent
current code directly sets BCACHE_DEV_WB_RUNNING to dc->disk.flags
and schedules kworker dc->writeback_rate_update.

If there is no cache set attached to, the writeback kernel thread is
not running indeed, running dc->writeback_rate_update does not make
sense and may cause NULL pointer deference when reference cache set
pointer inside update_writeback_rate().

This patch checks whether the cache set point (dc->disk.c) is NULL in
sysfs interface handler, and only set BCACHE_DEV_WB_RUNNING and
schedule dc->writeback_rate_update when dc->disk.c is not NULL (it
means the cache device is attached to a cache set).

This problem might be introduced from initial bcache commit, but
commit 3fd47bfe ("bcache: stop dc->writeback_rate_update properly")
changes part of the original code piece, so I add 'Fixes: 3fd47bfe'
to indicate from which commit this patch can be applied.

Fixes: 3fd47bfe ("bcache: stop dc->writeback_rate_update properly")
Reported-by: default avatarBjørn Forsman <bjorn.forsman@gmail.com>
Signed-off-by: default avatarColy Li <colyli@suse.de>
Reviewed-by: default avatarBjørn Forsman <bjorn.forsman@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 973fc2b3
Loading
Loading
Loading
Loading
+6 −1
Original line number Original line Diff line number Diff line
@@ -393,8 +393,13 @@ STORE(bch_cached_dev)
	if (attr == &sysfs_writeback_running)
	if (attr == &sysfs_writeback_running)
		bch_writeback_queue(dc);
		bch_writeback_queue(dc);


	/*
	 * Only set BCACHE_DEV_WB_RUNNING when cached device attached to
	 * a cache set, otherwise it doesn't make sense.
	 */
	if (attr == &sysfs_writeback_percent)
	if (attr == &sysfs_writeback_percent)
		if (!test_and_set_bit(BCACHE_DEV_WB_RUNNING, &dc->disk.flags))
		if ((dc->disk.c != NULL) &&
		    (!test_and_set_bit(BCACHE_DEV_WB_RUNNING, &dc->disk.flags)))
			schedule_delayed_work(&dc->writeback_rate_update,
			schedule_delayed_work(&dc->writeback_rate_update,
				      dc->writeback_rate_update_seconds * HZ);
				      dc->writeback_rate_update_seconds * HZ);