lkml.org 
[lkml]   [2016]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 069/142] rtnl: RTM_GETNETCONF: fix wrong return value
    Date
    3.16.7-ckt26 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Anton Protopopov <a.s.protopopov@gmail.com>

    commit a97eb33ff225f34a8124774b3373fd244f0e83ce upstream.

    An error response from a RTM_GETNETCONF request can return the positive
    error value EINVAL in the struct nlmsgerr that can mislead userspace.

    Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>
    Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/ipv4/devinet.c | 2 +-
    net/ipv6/addrconf.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
    index e9449376b58e..aa4b9990dd7a 100644
    --- a/net/ipv4/devinet.c
    +++ b/net/ipv4/devinet.c
    @@ -1798,7 +1798,7 @@ static int inet_netconf_get_devconf(struct sk_buff *in_skb,
    if (err < 0)
    goto errout;

    - err = EINVAL;
    + err = -EINVAL;
    if (!tb[NETCONFA_IFINDEX])
    goto errout;

    diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
    index 405575f9ae77..c844b31c767e 100644
    --- a/net/ipv6/addrconf.c
    +++ b/net/ipv6/addrconf.c
    @@ -535,7 +535,7 @@ static int inet6_netconf_get_devconf(struct sk_buff *in_skb,
    if (err < 0)
    goto errout;

    - err = EINVAL;
    + err = -EINVAL;
    if (!tb[NETCONFA_IFINDEX])
    goto errout;

    \
     
     \ /
      Last update: 2016-03-22 13:01    [W:4.059 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site