ch: fixup refcounting imbalance for SCSI devices
PATCH v2 1/3 ch: fixup refcounting imbalance for SCSI devices
In reply to Hannes ReineckeThe SCSI device is required to be present during ch_probe() and ch_open(). But the SCSI device itself is only checked during ch_open(), so it's anyones guess if it had been present during ch_probe(). And consequently we can't reliably detach it during ch_release(), as ch_remove() might have been called first. So initialize the changer device during ch_probe(), and take a reference to the SCSI device during both ch_probe() and ch_open().
--- drivers/scsi/ch.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
drivers/scsi/ch.c +18 -4
@@ -569,6 +569,7 @@ static void ch_destroy(struct kref *ref) {scsi_changer *ch =container_of (ref, scsi_changer, ref); + ch->device =NULL ;kfree (ch->dt);kfree (ch); }
@@ -594,14 +595,17 @@ ch_open(struct inode *inode, struct file *file)spin_lock (&ch_index_lock); ch =idr_find (&ch_index_idr, minor); -if (NULL == ch ||scsi_device_get (ch->device)) { +if (NULL == ch || !kref_get_unless_zero (&ch->ref)) {spin_unlock (&ch_index_lock);mutex_unlock (&ch_mutex);return -ENXIO ; } -kref_get (&ch->ref);spin_unlock (&ch_index_lock); - +if (scsi_device_get (ch->device)) { +kref_put (&ch->ref, ch_destroy); +mutex_unlock (&ch_mutex); +return -ENXIO ; + } file->private_data = ch;mutex_unlock (&ch_mutex);return 0 ;
@@ -938,6 +942,12 @@ static int ch_probe(struct device *dev) ch->minor = ret;sprintf (ch->name,"ch%d" ,ch->minor); + ret =scsi_device_get (sd); +if (ret) { +sdev_printk (KERN_WARNING , sd,"ch%d: failed to get device\n" , + ch->minor); + goto remove_idr; + } class_dev = device_create(ch_sysfs_class, dev, MKDEV(SCSI_CHANGER_MAJOR, ch->minor), ch,
@@ -946,7 +956,7 @@ static int ch_probe(struct device *dev)sdev_printk (KERN_WARNING , sd,"ch%d: device_create failed\n" , ch->minor); ret =PTR_ERR (class_dev); - goto remove_idr; + goto put_device; }mutex_init (&ch->lock);
@@ -964,6 +974,8 @@ static int ch_probe(struct device *dev)return 0 ; destroy_dev:device_destroy (ch_sysfs_class,MKDEV (SCSI_CHANGER_MAJOR , ch->minor)); +put_device: +scsi_device_put (sd); remove_idr:idr_remove (&ch_index_idr, ch->minor); free_ch:
@@ -977,9 +989,11 @@ static int ch_remove(struct device *dev)spin_lock (&ch_index_lock);idr_remove (&ch_index_idr, ch->minor); +dev_set_drvdata (dev,NULL );spin_unlock (&ch_index_lock);device_destroy (ch_sysfs_class,MKDEV (SCSI_CHANGER_MAJOR ,ch->minor)); +scsi_device_put (ch->device);kref_put (&ch->ref, ch_destroy);return 0 ; }
Signature · 1 line
2.16.4
PATCH v2 3/3 ch: remove ch_mutex()
In reply to Hannes Reineckech_mutex() was introduced with a mechanical conversion, but as we now have correct locking we can remove it altogether.
--- drivers/scsi/ch.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/scsi/ch.c +0 -5
@@ -44,7 +44,6 @@ MODULE_LICENSE("GPL");MODULE_ALIAS_CHARDEV_MAJOR (SCSI_CHANGER_MAJOR );MODULE_ALIAS_SCSI_DEVICE (TYPE_MEDIUM_CHANGER ); -static DEFINE_MUTEX (ch_mutex);static int init =1 ;module_param (init, int,0444 ); MODULE_PARM_DESC(init, \
@@ -591,26 +590,22 @@ ch_open(struct inode *inode, struct file *file)scsi_changer *ch;int minor =iminor (inode); -mutex_lock (&ch_mutex);spin_lock (&ch_index_lock); ch =idr_find (&ch_index_idr, minor);if (NULL == ch || !kref_get_unless_zero (&ch->ref)) {spin_unlock (&ch_index_lock); -mutex_unlock (&ch_mutex);return -ENXIO ; }spin_unlock (&ch_index_lock);if (scsi_device_get (ch->device)) {kref_put (&ch->ref, ch_destroy); -mutex_unlock (&ch_mutex);return -ENXIO ; }/* Synchronize with ch_probe() */ mutex_lock (&ch->lock); file->private_data = ch;mutex_unlock (&ch->lock); -mutex_unlock (&ch_mutex);return 0 ; }
Signature · 1 line
2.16.4
v2 cover ch: fixup refcounting imbalance for SCSI devices
Hi all,
here's a set of fixes for a long-standing issue in the 'ch' driver where we would crash if one of the referenced devices was removed from underneath us.
As usual, comments and reviews are welcome.
Changes to v1:
- Reworked after reviews from Bart
Hannes Reinecke (3):
ch: fixup refcounting imbalance for SCSI devices
ch: synchronize ch_probe() and ch_open()
ch: remove ch_mutex()
drivers/scsi/ch.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-)
Signature · 1 line
2.16.4
PATCH v2 2/3 ch: synchronize ch_probe() and ch_open()
The 'ch' device node is created before the configuration is being read in, which leads to a race window when ch_open() is called before that.
To avoid any races we should be taking the device mutex during ch_readconfig() and ch_init_elem(), and also during ch_open(). That ensures ch_probe is finished before ch_open() completes.
--- drivers/scsi/ch.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/scsi/ch.c +11 -4
@@ -606,7 +606,10 @@ ch_open(struct inode *inode, struct file *file)mutex_unlock (&ch_mutex);return -ENXIO ; } +/* Synchronize with ch_probe() */ +mutex_lock (&ch->lock); file->private_data = ch; +mutex_unlock (&ch->lock);mutex_unlock (&ch_mutex);return 0 ; }
@@ -949,6 +952,9 @@ static int ch_probe(struct device *dev) goto remove_idr; } +mutex_init (&ch->lock); +kref_init (&ch->ref); + ch->device = sd; class_dev =device_create (ch_sysfs_class, dev,MKDEV (SCSI_CHANGER_MAJOR , ch->minor), ch,"s%s" , ch->name);
@@ -959,15 +965,16 @@ static int ch_probe(struct device *dev) goto put_device; } -mutex_init (&ch->lock); -kref_init (&ch->ref); - ch->device = sd; +mutex_lock (&ch->lock); ret =ch_readconfig (ch); -if (ret) +if (ret) { +mutex_unlock (&ch->lock); goto destroy_dev; + }if (init)ch_init_elem (ch); +mutex_unlock (&ch->lock);dev_set_drvdata (dev, ch);sdev_printk (KERN_INFO , sd,"Attached scsi changer %s\n" , ch->name);
Signature · 1 line
2.16.4
Quoted 8 lines · Hannes Reinecke
The SCSI device is required to be present during
ch_probe()andch_open(). But the SCSI device itself is only checked duringch_open(), so it's anyones guess if it had been present duringch_probe(). And consequently we can't reliably detach it duringch_release(), asch_remove()might have been called first. So initialize the changer device duringch_probe(), and take a reference to the SCSI device during bothch_probe()andch_open().
Re: [PATCH 2/3] ch: synchronize ch_probe() and ch_open()
In reply to Hannes ReineckeQuoted 6 lines · Hannes Reinecke
The 'ch' device node is created before the configuration is being read in, which leads to a race window when
ch_open()is called before that.
To avoid any races we should be taking the device mutex duringch_readconfig()andch_init_elem(), and also duringch_open(). That ensuresch_probeis finished beforech_open()completes.
Re: [PATCH 3/3] ch: remove ch_mutex()
In reply to Hannes ReineckeQuoted 2 lines · Hannes Reinecke
ch_mutex()was introduced with a mechanical conversion, but as we now have correct locking we can remove it altogether.
Martin K. Petersen
AppliedHannes,
Quoted 3 lines
here's a set of fixes for a long-standing issue in the 'ch' driver where we would crash if one of the referenced devices was removed from underneath us.
Applied to 5.7/scsi-queue. Thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering