memset argument order misuses
Subsystems (3)
Hi Andrew,
A simple 'grep memset.*\<0);' shows argument order errors in several uses of memset.
This grep was inspired by Al Viro's recent patch, megaraid_mbox fix, which fixed this problem in the megaraid driver.
Completely untested.
Regards,
Joe
--
"Money can buy bandwidth, but latency is forever" -- John Mashey
drivers/s390/block/dasd_genhd.c +2 -2
@@ -149,8 +149,8 @@* Can't call delete_partitions directly. Use ioctl. * The ioctl also does locking and invalidation. */ -memset (&bpart,sizeof (struct blkpg_partition ),0 ); -memset (&barg,sizeof (struct blkpg_ioctl_arg ),0 ); +memset (&bpart,0 ,sizeof (struct blkpg_partition )); +memset (&barg,0 ,sizeof (struct blkpg_ioctl_arg )); barg.data = &bpart; barg.op =BLKPG_DEL_PARTITION ;for (bpart.pno = device->gdp->minors -1 ; bpart.pno >0 ; bpart.pno--)
drivers/s390/cio/cmf.c +2 -2
@@ -526,7 +526,7 @@ time =get_clock () - cdev->private->cmb_start_time;spin_unlock_irqrestore (cdev->ccwlock, flags); -memset (data,sizeof (struct cmbdata ),0 ); +memset (data,0 ,sizeof (struct cmbdata ));/* we only know values before device_busy_time */ data->size = offsetof(struct cmbdata , device_busy_time);
@@ -736,7 +736,7 @@ time =get_clock () - cdev->private->cmb_start_time;spin_unlock_irqrestore (cdev->ccwlock, flags); -memset (data,sizeof (struct cmbdata ),0 ); +memset (data,0 ,sizeof (struct cmbdata ));/* we only know values before device_busy_time */ data->size = offsetof(struct cmbdata , device_busy_time);
drivers/s390/cio/css.c +1 -1
@@ -527,7 +527,7 @@ new_slow_sch =kmalloc (sizeof (struct slow_subchannel ),GFP_ATOMIC );if (!new_slow_sch)return -ENOMEM ; -memset (new_slow_sch,sizeof (struct slow_subchannel ),0 ); +memset (new_slow_sch,0 ,sizeof (struct slow_subchannel )); new_slow_sch->schid = schid;spin_lock_irqsave (&slow_subchannel_lock, flags);list_add_tail (&new_slow_sch->slow_list, &slow_subchannels_head);
Quoted 8 lines · Joe Korty
Hi Andrew,
A simple 'grep memset.*\<0);' shows argument order errors in several uses of memset.This grep was inspired by Al Viro's recent patch,
megaraid_mboxfix, which fixed this problem in the megaraid driver.
heh. Lsydexic s/390 developers. Thanks, I guess we should scoot this into 2.6.11.
Quoted 55 lines
Regards,
Joe
--
"Money can buy bandwidth, but latency is forever" -- John Masheydiff -Nura
base/drivers/s390/block/dasd_genhd.cnew/drivers/s390/block/dasd_genhd.cdrivers/s390/block/dasd_genhd.c +2
-2@@ -149,8 +149,8 @@* Can't call delete_partitions directly. Use ioctl. * The ioctl also does locking and invalidation. */ -memset (&bpart,sizeof (struct blkpg_partition ),0 ); -memset (&barg,sizeof (struct blkpg_ioctl_arg ),0 ); +memset (&bpart,0 ,sizeof (struct blkpg_partition )); +memset (&barg,0 ,sizeof (struct blkpg_ioctl_arg )); barg.data = &bpart; barg.op =BLKPG_DEL_PARTITION ;for (bpart.pno = device->gdp->minors -1 ; bpart.pno >0 ; bpart.pno--)diff -Nura
base/drivers/s390/cio/cmf.cnew/drivers/s390/cio/cmf.cdrivers/s390/cio/cmf.c +2
-2@@ -526,7 +526,7 @@ time =get_clock () - cdev->private->cmb_start_time;spin_unlock_irqrestore (cdev->ccwlock, flags); -memset (data,sizeof (struct cmbdata ),0 ); +memset (data,0 ,sizeof (struct cmbdata ));/* we only know values before device_busy_time */ data->size = offsetof(struct cmbdata , device_busy_time);@@ -736,7 +736,7 @@ time =get_clock () - cdev->private->cmb_start_time;spin_unlock_irqrestore (cdev->ccwlock, flags); -memset (data,sizeof (struct cmbdata ),0 ); +memset (data,0 ,sizeof (struct cmbdata ));/* we only know values before device_busy_time */ data->size = offsetof(struct cmbdata , device_busy_time);diff -Nura
base/drivers/s390/cio/css.cnew/drivers/s390/cio/css.cdrivers/s390/cio/css.c +1
-1@@ -527,7 +527,7 @@ new_slow_sch =kmalloc (sizeof (struct slow_subchannel ),GFP_ATOMIC );if (!new_slow_sch)return -ENOMEM ; -memset (new_slow_sch,sizeof (struct slow_subchannel ),0 ); +memset (new_slow_sch,0 ,sizeof (struct slow_subchannel )); new_slow_sch->schid = schid;spin_lock_irqsave (&slow_subchannel_lock, flags);list_add_tail (&new_slow_sch->slow_list, &slow_subchannels_head);