lkml.org 
[lkml]   [2013]   [May]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 099/136 ] netfilter: ipset: "Directory not empty" error message
    3.6.11.4 stable review patch.
    If anyone has any objections, please let me know.

    ------------------

    From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

    [ Upstream commit dd82088dab3646ed28e4aa43d1a5b5d5ffc2afba ]

    When an entry flagged with "nomatch" was tested by ipset, it
    returned the error message "Kernel error received:
    Directory not empty" instead of "<element> is NOT in set <setname>"
    (reported by John Brendler).

    The internal error code was not properly transformed before returning
    to userspace, fixed.

    Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    net/netfilter/ipset/ip_set_core.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
    index 9730882..eaabc58 100644
    --- a/net/netfilter/ipset/ip_set_core.c
    +++ b/net/netfilter/ipset/ip_set_core.c
    @@ -1387,7 +1387,8 @@ ip_set_utest(struct sock *ctnl, struct sk_buff *skb,
    if (ret == -EAGAIN)
    ret = 1;

    - return ret < 0 ? ret : ret > 0 ? 0 : -IPSET_ERR_EXIST;
    + return (ret < 0 && ret != -ENOTEMPTY) ? ret :
    + ret > 0 ? 0 : -IPSET_ERR_EXIST;
    }

    /* Get headed data of a set */
    --
    1.7.10.4



    \
     
     \ /
      Last update: 2013-05-18 05:21    [W:4.758 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site