lkml.org 
[lkml]   [2014]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 088/140] rtnetlink: Warn when interfaces information wont fit in our packet
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

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

    From: David Gibson <david@gibson.dropbear.id.au>

    [ Upstream commit 973462bbde79bb827824c73b59027a0aed5c9ca6 ]

    Without IFLA_EXT_MASK specified, the information reported for a single
    interface in response to RTM_GETLINK is expected to fit within a netlink
    packet of NLMSG_GOODSIZE.

    If it doesn't, however, things will go badly wrong, When listing all
    interfaces, netlink_dump() will incorrectly treat -EMSGSIZE on the first
    message in a packet as the end of the listing and omit information for
    that interface and all subsequent ones. This can cause getifaddrs(3) to
    enter an infinite loop.

    This patch won't fix the problem, but it will WARN_ON() making it easier to
    track down what's going wrong.

    Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
    Reviewed-by: Jiri Pirko <jpirko@redhat.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/core/rtnetlink.c | 17 ++++++++++++-----
    1 file changed, 12 insertions(+), 5 deletions(-)

    --- a/net/core/rtnetlink.c
    +++ b/net/core/rtnetlink.c
    @@ -1130,6 +1130,7 @@ static int rtnl_dump_ifinfo(struct sk_bu
    struct hlist_head *head;
    struct nlattr *tb[IFLA_MAX+1];
    u32 ext_filter_mask = 0;
    + int err;

    s_h = cb->args[0];
    s_idx = cb->args[1];
    @@ -1150,11 +1151,17 @@ static int rtnl_dump_ifinfo(struct sk_bu
    hlist_for_each_entry_rcu(dev, head, index_hlist) {
    if (idx < s_idx)
    goto cont;
    - if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
    - NETLINK_CB(cb->skb).portid,
    - cb->nlh->nlmsg_seq, 0,
    - NLM_F_MULTI,
    - ext_filter_mask) <= 0)
    + err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
    + NETLINK_CB(cb->skb).portid,
    + cb->nlh->nlmsg_seq, 0,
    + NLM_F_MULTI,
    + ext_filter_mask);
    + /* If we ran out of room on the first message,
    + * we're in trouble
    + */
    + WARN_ON((err == -EMSGSIZE) && (skb->len == 0));
    +
    + if (err <= 0)
    goto out;

    nl_dump_check_consistent(cb, nlmsg_hdr(skb));



    \
     
     \ /
      Last update: 2014-05-29 08:41    [W:3.927 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site