From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935300Ab3BTNYy (ORCPT ); Wed, 20 Feb 2013 08:24:54 -0500 Received: from cantor2.suse.de ([195.135.220.15]:48217 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934388Ab3BTNYx (ORCPT ); Wed, 20 Feb 2013 08:24:53 -0500 From: Hannes Reinecke To: linux-kernel@vger.kernel.org Cc: Hannes Reinecke , Jiri Kosina Subject: [PATCH] i2o: remove compile-time warnings Date: Wed, 20 Feb 2013 14:24:50 +0100 Message-Id: <1361366690-62274-1-git-send-email-hare@suse.de> X-Mailer: git-send-email 1.7.4.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The compiler complains about invalid cast for i2o_config. However, the ioctl passes us an 32-bit address, which we have to assume is a valid 64-bit kernel address. So we should cast this to 'unsigned long' before casting it to a pointer. Minimal fix, doesn't break anything which wasn't broken before. Cc: Jiri Kosina Signed-off-by: Hannes Reinecke diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index 5451bef..5b95dc1 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c @@ -883,10 +883,9 @@ static int i2o_cfg_passthru(unsigned long arg) /* Copy in the user's SG buffer if necessary */ if (sg[i]. flag_count & 0x04000000 /*I2O_SGL_FLAGS_DIR */ ) { - // TODO 64bit fix - if (copy_from_user - (p->virt, (void __user *)sg[i].addr_bus, - sg_size)) { + void __user *sg_addr = (void __user *) + (unsigned long)sg[i].addr_bus; + if (copy_from_user(p->virt, sg_addr, sg_size)) { printk(KERN_DEBUG "%s: Could not copy SG buf %d FROM user\n", c->name, i); @@ -937,11 +936,12 @@ static int i2o_cfg_passthru(unsigned long arg) if (! (sg[j]. flag_count & 0x4000000 /*I2O_SGL_FLAGS_DIR */ )) { + void __user *sg_addr = (void __user *) + (unsigned long)sg[j].addr_bus; + sg_size = sg[j].flag_count & 0xffffff; - // TODO 64bit fix - if (copy_to_user - ((void __user *)sg[j].addr_bus, sg_list[j].virt, - sg_size)) { + if (copy_to_user(sg_addr, sg_list[j].virt, + sg_size)) { printk(KERN_WARNING "%s: Could not copy %p TO user %x\n", c->name, sg_list[j].virt,