From patchwork Sat Jun 28 18:36:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Himangi Saraogi X-Patchwork-Id: 365309 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C05D114007B for ; Sun, 29 Jun 2014 04:37:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932324AbaF1Sgr (ORCPT ); Sat, 28 Jun 2014 14:36:47 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:60600 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755517AbaF1Sgo (ORCPT ); Sat, 28 Jun 2014 14:36:44 -0400 Received: by mail-pd0-f172.google.com with SMTP id w10so6047863pde.3 for ; Sat, 28 Jun 2014 11:36:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=i+s5NVinn3eSd6CvC6kJZefN4Vl4BQ4kJy8fuy8KQik=; b=Ij1KQD7f3hxpvcP5PDL8DnGyntF2CZaPeJHFwrIK0skRwWnUclP7ez3BxL/4XSsd2z YcNvYNhtqDpFwVgGRLv7ldk9GLjvmB1F+KqsM58dHuyh02D2da7MrEY5mEVdbgntt1jW Wn09to2zSWL+RjKAnxl3tMe2Yiry9CLb+ADXXSCZm37+4yA+EfNppkWSZ13l+PDjmDjB d40FJCEj0B04myknjbVeXya/3Y99KQWOAHdGGho5CFkWQSkcwNTzOAjovjbbCURdz8w6 TgH2lEXht0rLXStA9b1kRajXrEcmSn7oznBjimUHu0TaoYf0gMxH56TOxeh29isENqia F66w== X-Received: by 10.66.137.109 with SMTP id qh13mr39898711pab.39.1403980604259; Sat, 28 Jun 2014 11:36:44 -0700 (PDT) Received: from localhost ([42.104.15.39]) by mx.google.com with ESMTPSA id tl3sm71171415pac.41.2014.06.28.11.36.38 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 28 Jun 2014 11:36:43 -0700 (PDT) Date: Sun, 29 Jun 2014 00:06:29 +0530 From: Himangi Saraogi To: Marek Lindner , Simon Wunderlich , Antonio Quartulli , "David S. Miller" , b.a.t.m.a.n@lists.open-mesh.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: julia.lawall@lip6.fr Subject: [PATCH] batman-adv: Use kasprintf Message-ID: <20140628183628.GA9946@himangi-Dell> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org kasprintf combines kmalloc and sprintf, and takes care of the size calculation itself. The semantic patch that makes this change is as follows: // @@ expression a,flag; expression list args; statement S; @@ a = - \(kmalloc\|kzalloc\)(...,flag) + kasprintf(flag,args) <... when != a if (a == NULL || ...) S ...> - sprintf(a,args); // Signed-off-by: Himangi Saraogi Acked-by: Julia Lawall --- net/batman-adv/sysfs.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index fc47baa..f40cb04 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -900,32 +900,24 @@ int batadv_throw_uevent(struct batadv_priv *bat_priv, enum batadv_uev_type type, bat_kobj = &bat_priv->soft_iface->dev.kobj; - uevent_env[0] = kmalloc(strlen(BATADV_UEV_TYPE_VAR) + - strlen(batadv_uev_type_str[type]) + 1, - GFP_ATOMIC); + uevent_env[0] = kasprintf(GFP_ATOMIC, + "%s%s", BATADV_UEV_TYPE_VAR, + batadv_uev_type_str[type]); if (!uevent_env[0]) goto out; - sprintf(uevent_env[0], "%s%s", BATADV_UEV_TYPE_VAR, - batadv_uev_type_str[type]); - - uevent_env[1] = kmalloc(strlen(BATADV_UEV_ACTION_VAR) + - strlen(batadv_uev_action_str[action]) + 1, - GFP_ATOMIC); + uevent_env[1] = kasprintf(GFP_ATOMIC, + "%s%s", BATADV_UEV_ACTION_VAR, + batadv_uev_action_str[action]); if (!uevent_env[1]) goto out; - sprintf(uevent_env[1], "%s%s", BATADV_UEV_ACTION_VAR, - batadv_uev_action_str[action]); - /* If the event is DEL, ignore the data field */ if (action != BATADV_UEV_DEL) { - uevent_env[2] = kmalloc(strlen(BATADV_UEV_DATA_VAR) + - strlen(data) + 1, GFP_ATOMIC); + uevent_env[2] = kasprintf(GFP_ATOMIC, + "%s%s", BATADV_UEV_DATA_VAR, data); if (!uevent_env[2]) goto out; - - sprintf(uevent_env[2], "%s%s", BATADV_UEV_DATA_VAR, data); } ret = kobject_uevent_env(bat_kobj, KOBJ_CHANGE, uevent_env);