Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752566AbZL2TQS (ORCPT ); Tue, 29 Dec 2009 14:16:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752475AbZL2TQO (ORCPT ); Tue, 29 Dec 2009 14:16:14 -0500 Received: from mgw1.diku.dk ([130.225.96.91]:59597 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752389AbZL2TQF (ORCPT ); Tue, 29 Dec 2009 14:16:05 -0500 Date: Tue, 29 Dec 2009 20:16:03 +0100 (CET) From: Julia Lawall To: James.Bottomley@suse.de, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 3/5] drivers/scsi : Correct the size argument to kmalloc Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1814 Lines: 60 From: Julia Lawall In each case, the destination of the allocation has type struct **, so the elements of the array should have pointer type, not structure type. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @disable sizeof_type_expr@ type T; T **x; @@ x = <+...sizeof( - T + *x )...+> // Signed-off-by: Julia Lawall --- drivers/scsi/aic94xx/aic94xx_init.c | 4 ++-- drivers/scsi/ch.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff -u -p a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c @@ -687,9 +687,9 @@ static int asd_register_sas_ha(struct as { int i; struct asd_sas_phy **sas_phys = - kmalloc(ASD_MAX_PHYS * sizeof(struct asd_sas_phy), GFP_KERNEL); + kmalloc(ASD_MAX_PHYS * sizeof(*sas_phys), GFP_KERNEL); struct asd_sas_port **sas_ports = - kmalloc(ASD_MAX_PHYS * sizeof(struct asd_sas_port), GFP_KERNEL); + kmalloc(ASD_MAX_PHYS * sizeof(*sas_ports), GFP_KERNEL); if (!sas_phys || !sas_ports) { kfree(sas_phys); diff -u -p a/drivers/scsi/ch.c b/drivers/scsi/ch.c --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c @@ -351,7 +351,7 @@ ch_readconfig(scsi_changer *ch) } /* look up the devices of the data transfer elements */ - ch->dt = kmalloc(ch->counts[CHET_DT]*sizeof(struct scsi_device), + ch->dt = kmalloc(ch->counts[CHET_DT]*sizeof(*ch->dt), GFP_KERNEL); if (!ch->dt) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/