lkml.org 
[lkml]   [2020]   [Apr]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 056/131] macsec: avoid to set wrong mtu
    Date
    From: Taehee Yoo <ap420073@gmail.com>

    [ Upstream commit 7f327080364abccf923fa5a5b24e038eb0ba1407 ]

    When a macsec interface is created, the mtu is calculated with the lower
    interface's mtu value.
    If the mtu of lower interface is lower than the length, which is needed
    by macsec interface, macsec's mtu value will be overflowed.
    So, if the lower interface's mtu is too low, macsec interface's mtu
    should be set to 0.

    Test commands:
    ip link add dummy0 mtu 10 type dummy
    ip link add macsec0 link dummy0 type macsec
    ip link show macsec0

    Before:
    11: macsec0@dummy0: <BROADCAST,MULTICAST,M-DOWN> mtu 4294967274
    After:
    11: macsec0@dummy0: <BROADCAST,MULTICAST,M-DOWN> mtu 0

    Fixes: c09440f7dcb3 ("macsec: introduce IEEE 802.1AE driver")
    Signed-off-by: Taehee Yoo <ap420073@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/macsec.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    --- a/drivers/net/macsec.c
    +++ b/drivers/net/macsec.c
    @@ -3238,11 +3238,11 @@ static int macsec_newlink(struct net *ne
    struct netlink_ext_ack *extack)
    {
    struct macsec_dev *macsec = macsec_priv(dev);
    + rx_handler_func_t *rx_handler;
    + u8 icv_len = DEFAULT_ICV_LEN;
    struct net_device *real_dev;
    - int err;
    + int err, mtu;
    sci_t sci;
    - u8 icv_len = DEFAULT_ICV_LEN;
    - rx_handler_func_t *rx_handler;

    if (!tb[IFLA_LINK])
    return -EINVAL;
    @@ -3258,7 +3258,11 @@ static int macsec_newlink(struct net *ne

    if (data && data[IFLA_MACSEC_ICV_LEN])
    icv_len = nla_get_u8(data[IFLA_MACSEC_ICV_LEN]);
    - dev->mtu = real_dev->mtu - icv_len - macsec_extra_len(true);
    + mtu = real_dev->mtu - icv_len - macsec_extra_len(true);
    + if (mtu < 0)
    + dev->mtu = 0;
    + else
    + dev->mtu = mtu;

    rx_handler = rtnl_dereference(real_dev->rx_handler);
    if (rx_handler && rx_handler != macsec_handle_frame)

    \
     
     \ /
      Last update: 2020-04-28 20:34    [W:4.380 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site