Unlock when sn_oemdata can't be extended
Subsystems (15)
PATCH 1/1 Unlock when sn_oemdata can't be extended
Unlock when sn_oemdata can't be extended
Signed-off-by Roel Kluin <[email protected]>
---
arch/ia64/sn/kernel/mca.c +1 -0
@@ -98,6 +98,7 @@ sn_platform_plat_specific_err_print(const u8 * sect_header, u8 ** oemdata,while (*sn_oemdata_size > sn_oemdata_bufsize) {u8 *newbuf =vmalloc (*sn_oemdata_size);if (!newbuf) { +mutex_unlock (&sn_oemdata_mutex);printk (KERN_ERR "%s: unable to extend sn_oemdata\n" , __FUNCTION__);return 1 ;
PATCH 2/2 Fix unlock on error
Fix unlock on error
Signed-off-by Roel Kluin <[email protected]>
---
arch/mips/kernel/irixsig.c +1 -0
@@ -426,6 +426,7 @@ asmlinkage int irix_sigprocmask(int how, irix_sigset_t __user *new,break ;default : +spin_unlock_irq (¤t->sighand->siglock);return -EINVAL ; }recalc_sigpending ();
arch/mips/vr41xx/common/icu.c +2 -0
@@ -525,6 +525,7 @@ static inline int set_sysint1_assign(unsigned int irq, unsigned char assign) intassign1 |= (uint16_t )assign <<9 ;break ;default : +spin_unlock_irq (&desc->lock);return -EINVAL ; }
@@ -592,6 +593,7 @@ static inline int set_sysint2_assign(unsigned int irq, unsigned char assign) intassign3 |= (uint16_t )assign <<12 ;break ;default : +spin_unlock_irq (&desc->lock);return -EINVAL ; }
Several unlocking issues
Signed-off-by Roel Kluin <[email protected]>
---
net/9p/mux.c +3 -1
@@ -222,8 +222,10 @@ static int p9_mux_poll_start(struct p9_conn *m) }if (i >=ARRAY_SIZE (p9_mux_poll_tasks)) { -if (vptlast ==NULL ) +if (vptlast ==NULL ) { +mutex_unlock (&p9_mux_task_lock);return -ENOMEM ; + }P9_DPRINTK (P9_DEBUG_MUX ,"put in proc %d\n" , i);list_add (&m->mux_list, &vptlast->mux_list);
net/bridge/netfilter/ebtables.c +3 -1
@@ -282,8 +282,10 @@ find_inlist_lock_noload(struct list_head *head, const char *name, int *error,return NULL ;list_for_each_entry (e, head, list) { -if (strcmp (e->name, name) ==0 ) +if (strcmp (e->name, name) ==0 ) { +mutex_unlock (mutex);return e; + } } *error = -ENOENT ;mutex_unlock (mutex);
net/netfilter/nf_conntrack_netlink.c +1 -1
@@ -1079,7 +1079,7 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb,CTA_TUPLE_MASTER , u3);if (err <0 ) -return err; + goto out_unlock; master_h =__nf_conntrack_find (&master,NULL );if (master_h ==NULL ) {
net/rose/af_rose.c +4 -2
@@ -750,8 +750,10 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le rose->neighbour =rose_get_neigh (&addr->srose_addr, &cause, &diagnostic); -if (!rose->neighbour) -return -ENETUNREACH ; +if (!rose->neighbour) { + err = -ENETUNREACH ; + goto out_release; + } rose->lci =rose_new_lci (rose->neighbour);if (!rose->lci) {
sound/oss/au1550_ac97.c +6 -2
@@ -1833,12 +1833,16 @@ au1550_open(struct inode *inode, struct file *file) }if (file->f_mode &FMODE_READ ) { -if ((ret =prog_dmabuf_adc (s))) +if ((ret =prog_dmabuf_adc (s))) { +mutex_unlock (&s->open_mutex);return ret; + } }if (file->f_mode &FMODE_WRITE ) { -if ((ret =prog_dmabuf_dac (s))) +if ((ret =prog_dmabuf_dac (s))) { +mutex_unlock (&s->open_mutex);return ret; + } } s->open_mode |= file->f_mode & (FMODE_READ |FMODE_WRITE );
sound/oss/dmasound/dmasound_atari.c +2 -0
@@ -1276,6 +1276,7 @@ static irqreturn_t AtaInterrupt(int irq, void *dummy)* (almost) like on the TT. */ write_sq_ignore_int =0 ; +spin_unlock (&dmasound.lock);return IRQ_HANDLED ; }
@@ -1284,6 +1285,7 @@ static irqreturn_t AtaInterrupt(int irq, void *dummy)* the sq variables, so better don't do anything here. */ WAKE_UP (write_sq.sync_queue); +spin_unlock (&dmasound.lock);return IRQ_HANDLED ; }
sound/pci/mixart/mixart.c +1 -0
@@ -608,6 +608,7 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,/* set the format to the board */ err =mixart_set_format (stream, format);if (err <0 ) { +mutex_unlock (&mgr->setup_mutex);return err; }
This includes some that I think I have reported earlier:
in drivers/media/dvb/dvb-usb/au6610.c
and drivers/media/dvb/dvb-usb/gl861.c
--
Some more unlocking issues
Signed-off-by Roel Kluin <[email protected]>
---
drivers/char/drm/sis_mm.c +1 -0
@@ -134,6 +134,7 @@ static int sis_drm_alloc(struct drm_device *dev, struct drm_file *file_priv, dev_priv->agp_initialized)) {DRM_ERROR ("Attempt to allocate from uninitialized memory manager.\n" ); +mutex_unlock (&dev->struct_mutex);return -EINVAL ; }
drivers/hwmon/max6650.c +1 -0
@@ -397,6 +397,7 @@ static ssize_t set_div(struct device *dev, struct device_attribute *devattr,default :dev_err (&client->dev,"illegal value for fan divider (%d)\n" , div); +mutex_unlock (&data->update_lock);return -EINVAL ; }
drivers/macintosh/macio-adb.c +1 -0
@@ -155,6 +155,7 @@ static int macio_adb_reset_bus(void)while ((in_8 (&adb->ctrl.r) &ADB_RST ) !=0 ) {if (--timeout ==0 ) {out_8 (&adb->ctrl.r,in_8 (&adb->ctrl.r) & ~ADB_RST ); +spin_unlock_irqrestore (&macio_lock, flags);return -1 ; } }
drivers/media/dvb/dvb-usb/au6610.c +3 -3
@@ -79,12 +79,12 @@ static int au6610_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],struct dvb_usb_device *d =i2c_get_adapdata (adap);int i; -if (mutex_lock_interruptible (&d->i2c_mutex) <0 ) -return -EAGAIN ; -if (num >2 )return -EINVAL ; +if (mutex_lock_interruptible (&d->i2c_mutex) <0 ) +return -EAGAIN ; +for (i =0 ; i < num; i++) {/* write/read request */ if (i+1 < num && (msg[i+1 ].flags &I2C_M_RD )) {
drivers/media/dvb/dvb-usb/gl861.c +3 -3
@@ -56,12 +56,12 @@ static int gl861_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],struct dvb_usb_device *d =i2c_get_adapdata (adap);int i; -if (mutex_lock_interruptible (&d->i2c_mutex) <0 ) -return -EAGAIN ; -if (num >2 )return -EINVAL ; +if (mutex_lock_interruptible (&d->i2c_mutex) <0 ) +return -EAGAIN ; +for (i =0 ; i < num; i++) {/* write/read request */ if (i+1 < num && (msg[i+1 ].flags &I2C_M_RD )) {
drivers/net/cris/eth_v10.c +1 -0
@@ -1476,6 +1476,7 @@ e100_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)e100_set_duplex (dev, autoneg);break ;default : +spin_unlock (&np->lock);return -EINVAL ; }spin_unlock (&np->lock);
drivers/usb/image/mdc800.c +1 -0
@@ -496,6 +496,7 @@ static int mdc800_usb_probe (struct usb_interface *intf, retval =usb_register_dev (intf, &mdc800_class);if (retval) { +mutex_unlock (&mdc800->io_lock);err ("Not able to get a minor for this device." );return -ENODEV ; }
drivers/watchdog/iTCO_wdt.c +1 -0
@@ -300,6 +300,7 @@ static int iTCO_wdt_start(void)/* disable chipset's NO_REBOOT bit */ if (iTCO_wdt_unset_NO_REBOOT_bit ()) { +spin_unlock (&iTCO_wdt_private.io_lock); printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n");return -EIO ; }
fs/sysfs/bin.c +3 -1
@@ -153,8 +153,10 @@ static int mmap(struct file *file, struct vm_area_struct *vma)mutex_lock (&bb->mutex);/* need attr_sd for attr, its parent for kobj */ -if (!sysfs_get_active_two (attr_sd)) +if (!sysfs_get_active_two (attr_sd)) { +mutex_unlock (&bb->mutex);return -ENODEV ; + } rc = -EINVAL ;if (attr->mmap)
net/9p/mux.c +3 -1
@@ -222,8 +222,10 @@ static int p9_mux_poll_start(struct p9_conn *m) }if (i >=ARRAY_SIZE (p9_mux_poll_tasks)) { -if (vptlast ==NULL ) +if (vptlast ==NULL ) { +mutex_unlock (&p9_mux_task_lock);return -ENOMEM ; + }P9_DPRINTK (P9_DEBUG_MUX ,"put in proc %d\n" , i);list_add (&m->mux_list, &vptlast->mux_list);
net/bridge/netfilter/ebtables.c +3 -1
@@ -282,8 +282,10 @@ find_inlist_lock_noload(struct list_head *head, const char *name, int *error,return NULL ;list_for_each_entry (e, head, list) { -if (strcmp (e->name, name) ==0 ) +if (strcmp (e->name, name) ==0 ) { +mutex_unlock (mutex);return e; + } } *error = -ENOENT ;mutex_unlock (mutex);
net/netfilter/nf_conntrack_netlink.c +1 -1
@@ -1079,7 +1079,7 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb,CTA_TUPLE_MASTER , u3);if (err <0 ) -return err; + goto out_unlock; master_h =__nf_conntrack_find (&master,NULL );if (master_h ==NULL ) {
net/rose/af_rose.c +4 -2
@@ -750,8 +750,10 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le rose->neighbour =rose_get_neigh (&addr->srose_addr, &cause, &diagnostic); -if (!rose->neighbour) -return -ENETUNREACH ; +if (!rose->neighbour) { + err = -ENETUNREACH ; + goto out_release; + } rose->lci =rose_new_lci (rose->neighbour);if (!rose->lci) {
sound/oss/au1550_ac97.c +6 -2
@@ -1833,12 +1833,16 @@ au1550_open(struct inode *inode, struct file *file) }if (file->f_mode &FMODE_READ ) { -if ((ret =prog_dmabuf_adc (s))) +if ((ret =prog_dmabuf_adc (s))) { +mutex_unlock (&s->open_mutex);return ret; + } }if (file->f_mode &FMODE_WRITE ) { -if ((ret =prog_dmabuf_dac (s))) +if ((ret =prog_dmabuf_dac (s))) { +mutex_unlock (&s->open_mutex);return ret; + } } s->open_mode |= file->f_mode & (FMODE_READ |FMODE_WRITE );
sound/oss/dmasound/dmasound_atari.c +2 -0
@@ -1276,6 +1276,7 @@ static irqreturn_t AtaInterrupt(int irq, void *dummy)* (almost) like on the TT. */ write_sq_ignore_int =0 ; +spin_unlock (&dmasound.lock);return IRQ_HANDLED ; }
@@ -1284,6 +1285,7 @@ static irqreturn_t AtaInterrupt(int irq, void *dummy)* the sq variables, so better don't do anything here. */ WAKE_UP (write_sq.sync_queue); +spin_unlock (&dmasound.lock);return IRQ_HANDLED ; }
sound/pci/mixart/mixart.c +1 -0
@@ -608,6 +608,7 @@ static int snd_mixart_hw_params(struct snd_pcm_substream *subs,/* set the format to the board */ err =mixart_set_format (stream, format);if (err <0 ) { +mutex_unlock (&mgr->setup_mutex);return err; }
David Miller
maintainerFrom: Roel Kluin <[email protected]>
Date: Wed, 24 Oct 2007 12:19:52 +0200
Quoted 2 lines
Several unlocking issues
Signed-off-by Roel Kluin <[email protected]>
Some of these are wrong, for example:
Quoted 6 lines
net/bridge/netfilter/ebtables.c +0
-0@@ -282,8 +282,10 @@ find_inlist_lock_noload(struct list_head *head, const char *name, int *error,return NULL ;
net/bridge/netfilter/ebtables.c find_inlist_lock_noload(struct list_head *head, const char *name, int *error, · line 291
Quoted 10 lines
net/bridge/netfilter/ebtables.c +3
-1list_for_each_entry (e, head, list) { -if (strcmp (e->name, name) ==0 ) +if (strcmp (e->name, name) ==0 ) { +mutex_unlock (mutex);return e; + } } *error = -ENOENT ;mutex_unlock (mutex);
Please look at the comment right about this function, it clearly explains that if the named object is found, the function returns with the mutex locked.
The rest of the networking cases look OK, please just resubmit the correct networking cases to [email protected].
Thanks.