lkml.org 
[lkml]   [2019]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 109/209] net/netlink_compat: Fix a missing check of nla_parse_nested
    Date
    From: Aditya Pakki <pakki001@umn.edu>

    [ Upstream commit 89dfd0083751d00d5d7ead36f6d8b045bf89c5e1 ]

    In tipc_nl_compat_sk_dump(), if nla_parse_nested() fails, it could return
    an error. To be consistent with other invocations of the function call,
    on error, the fix passes the return value upstream.

    Signed-off-by: Aditya Pakki <pakki001@umn.edu>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/tipc/netlink_compat.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
    index ad4dcc663c6de..1c8ac0c11008c 100644
    --- a/net/tipc/netlink_compat.c
    +++ b/net/tipc/netlink_compat.c
    @@ -1021,8 +1021,11 @@ static int tipc_nl_compat_sk_dump(struct tipc_nl_compat_msg *msg,
    u32 node;
    struct nlattr *con[TIPC_NLA_CON_MAX + 1];

    - nla_parse_nested(con, TIPC_NLA_CON_MAX,
    - sock[TIPC_NLA_SOCK_CON], NULL, NULL);
    + err = nla_parse_nested(con, TIPC_NLA_CON_MAX,
    + sock[TIPC_NLA_SOCK_CON], NULL, NULL);
    +
    + if (err)
    + return err;

    node = nla_get_u32(con[TIPC_NLA_CON_NODE]);
    tipc_tlv_sprintf(msg->rep, " connected to <%u.%u.%u:%u>",
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-04 19:06    [W:4.115 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site