From patchwork Fri Dec 7 11:49:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhijit Pawar X-Patchwork-Id: 204458 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 437EA2C00C6 for ; Fri, 7 Dec 2012 22:50:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933691Ab2LGLud (ORCPT ); Fri, 7 Dec 2012 06:50:33 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:49628 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932675Ab2LGLua (ORCPT ); Fri, 7 Dec 2012 06:50:30 -0500 Received: by mail-pa0-f46.google.com with SMTP id bh2so420353pad.19 for ; Fri, 07 Dec 2012 03:50:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=igc0KxB35n3AqOFAu0q+sHnfYGwB/LZjYggxYo9iIOs=; b=zGul9s2O3lGtKdxxAYFmRgkypoFPU4O/3MzgfI6AMcTH1h2NM2wwCFcl3gyi5wZQFT OqtQ5gibtKCoEXNPwPfRdMnaRIT3nEkazJOWuAWDtuoohDDeUrBVDaJj+AtnxDN682O8 enf2+hOpdPriE48sf8xlZ8HBxT46GADYMNcDm8TS9uugQPjaoqz3EQjCCwY2eUAbZ61K J+rXSkQi/tZn0ARa4DwAk5yxZ8cfENo8q2O5dJmklPtxrzP52LmC3Rc8bt1/P19ZhnIo q0gEGcm8iMxPW9hMsBW/c65MeFnx6eo39lnx6sC4fynup11O9jEq155SBgpqBYDe7jxT NgRQ== Received: by 10.68.231.41 with SMTP id td9mr14872272pbc.128.1354881029792; Fri, 07 Dec 2012 03:50:29 -0800 (PST) Received: from apawar-f16.cybage.com ([121.242.40.10]) by mx.google.com with ESMTPS id uq5sm6578671pbc.56.2012.12.07.03.50.23 (version=SSLv3 cipher=OTHER); Fri, 07 Dec 2012 03:50:29 -0800 (PST) From: Abhijit Pawar To: "David S. Miller" , Pablo Neira Ayuso , Patrick McHardy , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , "John W. Linville" , Johannes Berg , Cong Wang , Eric Dumazet , Neil Horman , Joe Perches Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, netfilter@vger.kernel.org, coreteam@netfilter.org, linux-wireless@vger.kernel.org, Abhijit Pawar Subject: [PATCH 2/4] net: remove obsolete simple_strto Date: Fri, 7 Dec 2012 17:19:58 +0530 Message-Id: <1354880998-23417-1-git-send-email-abhi.c.pawar@gmail.com> X-Mailer: git-send-email 1.7.7.6 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch replace the obsolete simple_strto with kstrto Signed-off-by: Abhijit Pawar --- net/core/netpoll.c | 9 +++++++-- net/ipv4/netfilter/ipt_CLUSTERIP.c | 9 +++++++-- net/mac80211/debugfs_sta.c | 4 +++- net/netfilter/nf_conntrack_core.c | 6 ++++-- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 77a0388..596b127 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -668,13 +668,16 @@ EXPORT_SYMBOL(netpoll_print_options); int netpoll_parse_options(struct netpoll *np, char *opt) { + int rc; char *cur=opt, *delim; if (*cur != '@') { if ((delim = strchr(cur, '@')) == NULL) goto parse_failed; *delim = 0; - np->local_port = simple_strtol(cur, NULL, 10); + rc = kstrtol(cur, 10, &np->local_port); + if (rc) + goto parse_failed; cur = delim; } cur++; @@ -705,7 +708,9 @@ int netpoll_parse_options(struct netpoll *np, char *opt) *delim = 0; if (*cur == ' ' || *cur == '\t') np_info(np, "warning: whitespace is not allowed\n"); - np->remote_port = simple_strtol(cur, NULL, 10); + rc = kstrtol(cur, 10, &np->remote_port); + if (rc) + goto parse_failed; cur = delim; } cur++; diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c index fe5daea..55e7b73 100644 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c @@ -661,6 +661,7 @@ static ssize_t clusterip_proc_write(struct file *file, const char __user *input, #define PROC_WRITELEN 10 char buffer[PROC_WRITELEN+1]; unsigned long nodenum; + int rc; if (size > PROC_WRITELEN) return -EIO; @@ -669,11 +670,15 @@ static ssize_t clusterip_proc_write(struct file *file, const char __user *input, buffer[size] = 0; if (*buffer == '+') { - nodenum = simple_strtoul(buffer+1, NULL, 10); + rc = kstrtoul(buffer+1, 10, &nodenum); + if (rc) + return -EINVAL; if (clusterip_add_node(c, nodenum)) return -ENOMEM; } else if (*buffer == '-') { - nodenum = simple_strtoul(buffer+1, NULL,10); + rc = kstrtoul(buffer+1, 10, &nodenum); + if (rc) + return -EINVAL; if (clusterip_del_node(c, nodenum)) return -ENOENT; } else diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index 89281d2..18754fd 100644 --- a/net/mac80211/debugfs_sta.c +++ b/net/mac80211/debugfs_sta.c @@ -219,7 +219,9 @@ static ssize_t sta_agg_status_write(struct file *file, const char __user *userbu } else return -EINVAL; - tid = simple_strtoul(buf, NULL, 0); + ret = kstrtoul(buf, 0, &tid); + if (ret) + return -EINVAL; if (tid >= IEEE80211_NUM_TIDS) return -EINVAL; diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index af17516..18ce24b 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1409,7 +1409,7 @@ EXPORT_SYMBOL_GPL(nf_ct_alloc_hashtable); int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp) { - int i, bucket; + int i, bucket, rc; unsigned int hashsize, old_size; struct hlist_nulls_head *hash, *old_hash; struct nf_conntrack_tuple_hash *h; @@ -1422,7 +1422,9 @@ int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp) if (!nf_conntrack_htable_size) return param_set_uint(val, kp); - hashsize = simple_strtoul(val, NULL, 0); + rc = kstrtouint(val, 0, &hashsize); + if (rc) + return -EINVAL; if (!hashsize) return -EINVAL;