]> git.baikalelectronics.ru Git - kernel.git/commit
rbd: call rbd_dev_unprobe() after unwatching and flushing notifies
authorIlya Dryomov <idryomov@gmail.com>
Mon, 16 Mar 2020 14:52:54 +0000 (15:52 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Apr 2020 08:36:27 +0000 (10:36 +0200)
commit0f79a1df7bf9a43377ff0e5c151428b62405c4a4
tree3b37bcd358668f0384c0734f12d33da979eb5cea
parentd602511d25dc69217ce83ca8ed7de04b260be682
rbd: call rbd_dev_unprobe() after unwatching and flushing notifies

[ Upstream commit c5f381db40eae98e14005762f837e3351e09084b ]

rbd_dev_unprobe() is supposed to undo most of rbd_dev_image_probe(),
including rbd_dev_header_info(), which means that rbd_dev_header_info()
isn't supposed to be called after rbd_dev_unprobe().

However, rbd_dev_image_release() calls rbd_dev_unprobe() before
rbd_unregister_watch().  This is racy because a header update notify
can sneak in:

  "rbd unmap" thread                   ceph-watch-notify worker

  rbd_dev_image_release()
    rbd_dev_unprobe()
      free and zero out header
                                       rbd_watch_cb()
                                         rbd_dev_refresh()
                                           rbd_dev_header_info()
                                             read in header

The same goes for "rbd map" because rbd_dev_image_probe() calls
rbd_dev_unprobe() on errors.  In both cases this results in a memory
leak.

Fixes: 15a9985cd36e ("rbd: move rbd_unregister_watch() call into rbd_dev_image_release()")
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/block/rbd.c