From: Jesper Juhl Date: Thu, 1 Mar 2012 22:01:19 +0000 (+0100) Subject: Allocate correct size (portably) in drivers/usb/gadget/f_midi.c::f_midi_bind() X-Git-Tag: MMI-PSA29.97-13-9~17266^2~22^2~28 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2a5be8783e0016d15e7907ddd212b2c312e196eb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Allocate correct size (portably) in drivers/usb/gadget/f_midi.c::f_midi_bind() As the coverity checker puts it: "Passing argument "sizeof (midi_function) /*8*/" to function "kcalloc" and then casting the return value to "struct usb_descriptor_header **" is suspicious. ... In this particular case sizeof(struct usb_descriptor_header **) happens to be equal to sizeof(struct usb_descriptor_header *), but this is not a portable assumption." I believe we really do intend to use 'sizeof(*midi_function)' here, so this patch makes that change. Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/gadget/f_midi.c b/drivers/usb/gadget/f_midi.c index 3797b3d6c622..2f7e8f2930cc 100644 --- a/drivers/usb/gadget/f_midi.c +++ b/drivers/usb/gadget/f_midi.c @@ -780,7 +780,7 @@ f_midi_bind(struct usb_configuration *c, struct usb_function *f) midi->out_ep->driver_data = cdev; /* claim */ /* allocate temporary function list */ - midi_function = kcalloc((MAX_PORTS * 4) + 9, sizeof(midi_function), + midi_function = kcalloc((MAX_PORTS * 4) + 9, sizeof(*midi_function), GFP_KERNEL); if (!midi_function) { status = -ENOMEM;