From patchwork Tue Nov 20 08:30:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 200256 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 234FA2C007E for ; Tue, 20 Nov 2012 19:32:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752583Ab2KTIa3 (ORCPT ); Tue, 20 Nov 2012 03:30:29 -0500 Received: from mail-ie0-f174.google.com ([209.85.223.174]:46901 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752480Ab2KTIa2 (ORCPT ); Tue, 20 Nov 2012 03:30:28 -0500 Received: by mail-ie0-f174.google.com with SMTP id k13so8174101iea.19 for ; Tue, 20 Nov 2012 00:30:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=AV8tNgfgjBr2S/QpcGJqhF61RUJU8JC10tg3t/oRW7Y=; b=eziQA2TV2EaRRAlXG+K/wqR4mxfZT8HcU1zPJzQEQmifSz1JRirqd7QRDc/MgwzSdN J1tjzfOVJlhZpYHtjOxkJHIXxP+hNGeeS5o5kavZQv7I+NP0GSRDB3gOLXwShVMXP+CR 3KoSem2j+8tx5LgIpgUQg08LsOdGNMyAjbBFYHD4QjZOHMyqX5foyLmYd8lAio+cb19B hJ4SSpVG4f7/ZX6gGLWKaQIXrANn7lE4CShorE/y8fYZ9KZm2R/W1rXvm3pi/JKe/Tew TVWGiMvA/26UjOoT+M2EAnArhRKfstILhLSfsd/kqtZDgnvpBhsR2tzco47yZzio0myg rgXQ== Received: by 10.50.47.197 with SMTP id f5mr9347167ign.23.1353400227888; Tue, 20 Nov 2012 00:30:27 -0800 (PST) Received: from htj.dyndns.org.com (50-78-106-165-static.hfc.comcastbusiness.net. [50.78.106.165]) by mx.google.com with ESMTPS id uj6sm9933824igb.4.2012.11.20.00.30.25 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Nov 2012 00:30:26 -0800 (PST) From: Tejun Heo To: daniel.wagner@bmw-carit.de, serge.hallyn@canonical.com, ebiederm@xmission.com, nhorman@tuxdriver.com, tgraf@suug.ch Cc: davem@davemloft.net, lizefan@huawei.com, cgroups@vger.kernel.org, containers@lists.linux-foundation.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Tejun Heo Subject: [PATCH 2/7] netprio_cgroup: simplify write_priomap() Date: Tue, 20 Nov 2012 00:30:06 -0800 Message-Id: <1353400211-5182-3-git-send-email-tj@kernel.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1353400211-5182-1-git-send-email-tj@kernel.org> References: <1353400211-5182-1-git-send-email-tj@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org sscanf() doesn't bite. Signed-off-by: Tejun Heo Acked-by: Neil Horman --- net/core/netprio_cgroup.c | 56 ++++++++++------------------------------------- 1 file changed, 11 insertions(+), 45 deletions(-) diff --git a/net/core/netprio_cgroup.c b/net/core/netprio_cgroup.c index f0b6b0d..66d98da 100644 --- a/net/core/netprio_cgroup.c +++ b/net/core/netprio_cgroup.c @@ -176,66 +176,32 @@ static int read_priomap(struct cgroup *cont, struct cftype *cft, static int write_priomap(struct cgroup *cgrp, struct cftype *cft, const char *buffer) { - char *devname = kstrdup(buffer, GFP_KERNEL); - int ret = -EINVAL; u32 prioidx = cgrp_netprio_state(cgrp)->prioidx; - unsigned long priority; - char *priostr; + char devname[IFNAMSIZ + 1]; struct net_device *dev; struct netprio_map *map; + u32 prio; + int ret; - if (!devname) - return -ENOMEM; - - /* - * Minimally sized valid priomap string - */ - if (strlen(devname) < 3) - goto out_free_devname; - - priostr = strstr(devname, " "); - if (!priostr) - goto out_free_devname; - - /* - *Separate the devname from the associated priority - *and advance the priostr pointer to the priority value - */ - *priostr = '\0'; - priostr++; - - /* - * If the priostr points to NULL, we're at the end of the passed - * in string, and its not a valid write - */ - if (*priostr == '\0') - goto out_free_devname; - - ret = kstrtoul(priostr, 10, &priority); - if (ret < 0) - goto out_free_devname; - - ret = -ENODEV; + if (sscanf(buffer, "%"__stringify(IFNAMSIZ)"s %u", devname, &prio) != 2) + return -EINVAL; dev = dev_get_by_name(&init_net, devname); if (!dev) - goto out_free_devname; + return -ENODEV; rtnl_lock(); + ret = write_update_netdev_table(dev); - if (ret < 0) - goto out_put_dev; + if (ret) + goto out_unlock; map = rtnl_dereference(dev->priomap); if (map) - map->priomap[prioidx] = priority; - -out_put_dev: + map->priomap[prioidx] = prio; +out_unlock: rtnl_unlock(); dev_put(dev); - -out_free_devname: - kfree(devname); return ret; }