lkml.org 
[lkml]   [2016]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 17/66] rtnl: fix msg size calculation in if_nlmsg_size()
    Date
    3.19.8-ckt20 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Nicolas Dichtel <nicolas.dichtel@6wind.com>

    [ Upstream commit c57c7a95da842807b475b823ed2e5435c42cb3b0 ]

    Size of the attribute IFLA_PHYS_PORT_NAME was missing.

    Fixes: db24a9044ee1 ("net: add support for phys_port_name")
    CC: David Ahern <dsahern@gmail.com>
    Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
    Acked-by: David Ahern <dsahern@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    net/core/rtnetlink.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
    index e732b7e..743ee58 100644
    --- a/net/core/rtnetlink.c
    +++ b/net/core/rtnetlink.c
    @@ -871,7 +871,8 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
    + rtnl_link_get_size(dev) /* IFLA_LINKINFO */
    + rtnl_link_get_af_size(dev) /* IFLA_AF_SPEC */
    + nla_total_size(MAX_PHYS_ITEM_ID_LEN) /* IFLA_PHYS_PORT_ID */
    - + nla_total_size(MAX_PHYS_ITEM_ID_LEN); /* IFLA_PHYS_SWITCH_ID */
    + + nla_total_size(MAX_PHYS_ITEM_ID_LEN) /* IFLA_PHYS_SWITCH_ID */
    + + nla_total_size(IFNAMSIZ); /* IFLA_PHYS_PORT_NAME */
    }

    static int rtnl_vf_ports_fill(struct sk_buff *skb, struct net_device *dev)
    --
    2.7.4
    \
     
     \ /
      Last update: 2016-04-26 23:01    [W:4.268 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site