On Sat, May 15, 2010 at 10:16:58PM +0100, Julia Lawall wrote: > From: Julia Lawall <julia@xxxxxxx> > > Use kmemdup when some other buffer is immediately copied into the > allocated region. > > A simplified version of the semantic patch that makes this change is as > follows: (http://coccinelle.lip6.fr/) > > // <smpl> > @@ > expression from,to,size,flag; > statement S; > @@ > > - to = \(kmalloc\|kzalloc\)(size,flag); > + to = kmemdup(from,size,flag); > if (to==NULL || ...) S > - memcpy(to, from, size); > // </smpl> > > Signed-off-by: Julia Lawall <julia@xxxxxxx> Acked-by: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> Cheers, Samuel. > --- > drivers/net/wireless/iwmc3200wifi/rx.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff -u -p a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c > --- a/drivers/net/wireless/iwmc3200wifi/rx.c > +++ b/drivers/net/wireless/iwmc3200wifi/rx.c > @@ -321,14 +321,14 @@ iwm_rx_ticket_node_alloc(struct iwm_priv > return ERR_PTR(-ENOMEM); > } > > - ticket_node->ticket = kzalloc(sizeof(struct iwm_rx_ticket), GFP_KERNEL); > + ticket_node->ticket = kmemdup(ticket, sizeof(struct iwm_rx_ticket), > + GFP_KERNEL); > if (!ticket_node->ticket) { > IWM_ERR(iwm, "Couldn't allocate RX ticket\n"); > kfree(ticket_node); > return ERR_PTR(-ENOMEM); > } > > - memcpy(ticket_node->ticket, ticket, sizeof(struct iwm_rx_ticket)); > INIT_LIST_HEAD(&ticket_node->node); > > return ticket_node; -- Intel Open Source Technology Centre http://oss.intel.com/ --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
