lkml.org 
[lkml]   [2012]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] net/ipv4: replace simple_strtoul with kstrtoul
    Date
    Replace simple_strtoul with kstrtoul in three similar occurrences, all setup
    handlers:
    * route.c: set_rhash_entries
    * tcp.c: set_thash_entries
    * udp.c: set_uhash_entries

    Also check if the conversion failed.

    Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
    ---
    net/ipv4/route.c | 8 +++++++-
    net/ipv4/tcp.c | 8 +++++++-
    net/ipv4/udp.c | 8 +++++++-
    3 files changed, 21 insertions(+), 3 deletions(-)

    diff --git a/net/ipv4/route.c b/net/ipv4/route.c
    index 167ea10..84d1832 100644
    --- a/net/ipv4/route.c
    +++ b/net/ipv4/route.c
    @@ -3430,9 +3430,15 @@ struct ip_rt_acct __percpu *ip_rt_acct __read_mostly;
    static __initdata unsigned long rhash_entries;
    static int __init set_rhash_entries(char *str)
    {
    + ssize_t ret;
    +
    if (!str)
    return 0;
    - rhash_entries = simple_strtoul(str, &str, 0);
    +
    + ret = kstrtoul(str, 0, &rhash_entries);
    + if (ret)
    + return 0;
    +
    return 1;
    }
    __setup("rhash_entries=", set_rhash_entries);
    diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
    index 6589e11..6ed0552 100644
    --- a/net/ipv4/tcp.c
    +++ b/net/ipv4/tcp.c
    @@ -3222,9 +3222,15 @@ extern struct tcp_congestion_ops tcp_reno;
    static __initdata unsigned long thash_entries;
    static int __init set_thash_entries(char *str)
    {
    + ssize_t ret;
    +
    if (!str)
    return 0;
    - thash_entries = simple_strtoul(str, &str, 0);
    +
    + ret = kstrtoul(str, 0, &thash_entries);
    + if (ret)
    + return 0;
    +
    return 1;
    }
    __setup("thash_entries=", set_thash_entries);
    diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
    index fe14105..662836a 100644
    --- a/net/ipv4/udp.c
    +++ b/net/ipv4/udp.c
    @@ -2163,9 +2163,15 @@ void udp4_proc_exit(void)
    static __initdata unsigned long uhash_entries;
    static int __init set_uhash_entries(char *str)
    {
    + ssize_t ret;
    +
    if (!str)
    return 0;
    - uhash_entries = simple_strtoul(str, &str, 0);
    +
    + ret = kstrtoul(str, 0, &uhash_entries);
    + if (ret)
    + return 0;
    +
    if (uhash_entries && uhash_entries < UDP_HTABLE_SIZE_MIN)
    uhash_entries = UDP_HTABLE_SIZE_MIN;
    return 1;
    --
    1.7.10


    \
     
     \ /
      Last update: 2012-05-20 02:21    [W:0.027 / U:30.788 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site