Skip to content

Commit 3a4ce14

Browse files
bcodding-rhTrond Myklebust
authored andcommitted
nfs/blocklayout: Don't attempt unregister for invalid block device
Since commit d869da9 ("nfs/blocklayout: Fix premature PR key unregistration") an unmount of a pNFS SCSI layout-enabled NFS may dereference a NULL block_device in: bl_unregister_scsi+0x16/0xe0 [blocklayoutdriver] bl_free_device+0x70/0x80 [blocklayoutdriver] bl_free_deviceid_node+0x12/0x30 [blocklayoutdriver] nfs4_put_deviceid_node+0x60/0xc0 [nfsv4] nfs4_deviceid_purge_client+0x132/0x190 [nfsv4] unset_pnfs_layoutdriver+0x59/0x60 [nfsv4] nfs4_destroy_server+0x36/0x70 [nfsv4] nfs_free_server+0x23/0xe0 [nfs] deactivate_locked_super+0x30/0xb0 cleanup_mnt+0xba/0x150 task_work_run+0x59/0x90 syscall_exit_to_user_mode+0x217/0x220 do_syscall_64+0x8e/0x160 This happens because even though we were able to create the nfs4_deviceid_node, the lookup for the device was unable to attach the block device to the pnfs_block_dev. If we never found a block device to register, we can avoid this case with the PNFS_BDEV_REGISTERED flag. Move the deref behind the test for the flag. Fixes: d869da9 ("nfs/blocklayout: Fix premature PR key unregistration") Signed-off-by: Benjamin Coddington <bcodding@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1 parent 3f23f96 commit 3a4ce14

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

fs/nfs/blocklayout/dev.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ static void bl_unregister_scsi(struct pnfs_block_dev *dev)
2020
const struct pr_ops *ops = bdev->bd_disk->fops->pr_ops;
2121
int status;
2222

23-
if (!test_and_clear_bit(PNFS_BDEV_REGISTERED, &dev->flags))
24-
return;
25-
2623
status = ops->pr_register(bdev, dev->pr_key, 0, false);
2724
if (status)
2825
trace_bl_pr_key_unreg_err(bdev, dev->pr_key, status);
@@ -58,7 +55,8 @@ static void bl_unregister_dev(struct pnfs_block_dev *dev)
5855
return;
5956
}
6057

61-
if (dev->type == PNFS_BLOCK_VOLUME_SCSI)
58+
if (dev->type == PNFS_BLOCK_VOLUME_SCSI &&
59+
test_and_clear_bit(PNFS_BDEV_REGISTERED, &dev->flags))
6260
bl_unregister_scsi(dev);
6361
}
6462

0 commit comments

Comments
 (0)