net: remove obsolete simple_strto<foo>

This patch replace the obsolete simple_strto<foo> with kstrto<foo>

Signed-off-by: Abhijit Pawar <abhi.c.pawar@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 18 insertions, 4 deletions

diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 77a0388fc3be..12c129f726f9 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -674,7 +674,8 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
                 if ((delim = strchr(cur, '@')) == NULL)
                         goto parse_failed;
                 *delim = 0;
-                np->local_port = simple_strtol(cur, NULL, 10);
+                if (kstrtou16(cur, 10, &np->local_port))
+                        goto parse_failed;
                 cur = delim;
         }
         cur++;
@@ -706,6 +707,8 @@ int netpoll_parse_options(struct netpoll *np, char *opt)
                 if (*cur == ' ' || *cur == '\t')
                         np_info(np, "warning: whitespace is not allowed\n");
                 np->remote_port = simple_strtol(cur, NULL, 10);
+                if (kstrtou16(cur, 10, &np->remote_port))
+                        goto parse_failed;
                 cur = delim;
         }
         cur++;
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index fe5daea5214d..75e33a7048f8 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 rc;
                 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 rc;
                 if (clusterip_del_node(c, nodenum))
                         return -ENOENT;
         } else
diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index 49a1c70bbd70..0dedb4bd9623 100644
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -221,6 +221,9 @@ static ssize_t sta_agg_status_write(struct file *file, const char __user *userbu
                 return -EINVAL;
 
         tid = simple_strtoul(buf, NULL, 0);
+        ret = kstrtoul(buf, 0, &tid);
+        if (ret)
+                return ret;
 
         if (tid >= IEEE80211_NUM_TIDS)
                 return -EINVAL;
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index af175166fffa..37d9e628106d 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;
@@ -1423,6 +1423,9 @@ int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp)
                 return param_set_uint(val, kp);
 
         hashsize = simple_strtoul(val, NULL, 0);
+        rc = kstrtouint(val, 0, &hashsize);
+        if (rc)
+                return rc;
         if (!hashsize)
                 return -EINVAL;