| Message ID | 1355130748-7828-1-git-send-email-abhi.c.pawar@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Mon, Dec 10, 2012 at 02:42:28PM +0530, Abhijit Pawar wrote: > 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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Abhijit Pawar <abhi.c.pawar@gmail.com> Date: Mon, 10 Dec 2012 14:42:28 +0530 > This patch replace the obsolete simple_strto<foo> with kstrto<foo> > > Signed-off-by: Abhijit Pawar <abhi.c.pawar@gmail.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/11/2012 12:40 AM, David Miller wrote: > From: Abhijit Pawar <abhi.c.pawar@gmail.com> > Date: Mon, 10 Dec 2012 14:42:28 +0530 > >> This patch replace the obsolete simple_strto<foo> with kstrto<foo> >> >> Signed-off-by: Abhijit Pawar <abhi.c.pawar@gmail.com> > > Applied. > Hi David, It seems that there are occurences of simple_strto* still present in the couple of files which are not yet removed correctly by this patch. I will send a modified patch shortly. Please revert this commit and use the newly sent patch to merge with the tree.
From: Abhijit Pawar <abhi.c.pawar@gmail.com> Date: Tue, 11 Dec 2012 06:36:59 +0530 > It looks like there are two occurences of simple_strtoul which has not been > removed cleanly from the patch. > They are in netpoll.c and debugfs_sta.c > I will send the modified corrected clean patch shortly. You can't simply send me a replacement patch, since I already applied the original one and that patch will not be reverted. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Abhijit Pawar <abhi.c.pawar@gmail.com> Date: Tue, 11 Dec 2012 09:03:41 +0530 > On 12/11/2012 12:40 AM, David Miller wrote: >> From: Abhijit Pawar <abhi.c.pawar@gmail.com> >> Date: Mon, 10 Dec 2012 14:42:28 +0530 >> >>> This patch replace the obsolete simple_strto<foo> with kstrto<foo> >>> >>> Signed-off-by: Abhijit Pawar <abhi.c.pawar@gmail.com> >> >> Applied. >> > Hi David, > It seems that there are occurences of simple_strto* still present in the > couple of files which are not yet removed correctly by this patch. I > will send a modified patch shortly. Please revert this commit and use > the newly sent patch to merge with the tree. Again, you cannot send "modified" patches. When I say I've applied your patch, that cannot be undone. You must therefore send me fixup patches relative to the ones I've applied already. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 77a0388..12c129f 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 fe5daea..75e33a7 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 49a1c70..0dedb4b 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 af17516..37d9e62 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;
This patch replace the obsolete simple_strto<foo> with kstrto<foo> Signed-off-by: Abhijit Pawar <abhi.c.pawar@gmail.com> --- net/core/netpoll.c | 5 ++++- net/ipv4/netfilter/ipt_CLUSTERIP.c | 9 +++++++-- net/mac80211/debugfs_sta.c | 3 +++ net/netfilter/nf_conntrack_core.c | 5 ++++- 4 files changed, 18 insertions(+), 4 deletions(-)