Messages in this thread Patch in this message | | | From | David Howells <> | Subject | [PATCH 1/6] Werror: Fix casting wrong size integer to pointer | Date | Thu, 29 May 2008 19:17:26 +0100 |
| |
Fix casting wrong size integer to pointer. Smaller integers must be cast to unsigned long then cast to a pointer.
Signed-off-by: David Howells <dhowells@redhat.com> ---
drivers/char/drm/sis_mm.c | 2 +- drivers/message/i2o/i2o_config.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c index b387877..378b275 100644 --- a/drivers/char/drm/sis_mm.c +++ b/drivers/char/drm/sis_mm.c @@ -57,7 +57,7 @@ static void *sis_sman_mm_allocate(void *private, unsigned long size, if (req.size == 0) return NULL; else - return (void *)~req.offset; + return (void *)(unsigned long)~req.offset; } static void sis_sman_mm_free(void *private, void *ref) diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index c0fb77d..a1c83af 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c @@ -886,7 +886,7 @@ static int i2o_cfg_passthru(unsigned long arg) flag_count & 0x04000000 /*I2O_SGL_FLAGS_DIR */ ) { // TODO 64bit fix if (copy_from_user - (p, (void __user *)sg[i].addr_bus, + (p, (void __user *)(unsigned long)sg[i].addr_bus, sg_size)) { printk(KERN_DEBUG "%s: Could not copy SG buf %d FROM user\n", @@ -942,7 +942,7 @@ static int i2o_cfg_passthru(unsigned long arg) sg_size = sg[j].flag_count & 0xffffff; // TODO 64bit fix if (copy_to_user - ((void __user *)sg[j].addr_bus, sg_list[j], + ((void __user *)(unsigned long)sg[j].addr_bus, sg_list[j], sg_size)) { printk(KERN_WARNING "%s: Could not copy %p TO user %x\n",
| |