lkml.org 
[lkml]   [2020]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 007/178] net: bridge: enfore alignment for ethernet address
    Date
    From: Thomas Martitz <t.martitz@avm.de>

    [ Upstream commit db7202dec92e6caa2706c21d6fc359af318bde2e ]

    The eth_addr member is passed to ether_addr functions that require
    2-byte alignment, therefore the member must be properly aligned
    to avoid unaligned accesses.

    The problem is in place since the initial merge of multicast to unicast:
    commit 6db6f0eae6052b70885562e1733896647ec1d807 bridge: multicast to unicast

    Fixes: 6db6f0eae605 ("bridge: multicast to unicast")
    Cc: Roopa Prabhu <roopa@cumulusnetworks.com>
    Cc: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
    Cc: David S. Miller <davem@davemloft.net>
    Cc: Jakub Kicinski <kuba@kernel.org>
    Cc: Felix Fietkau <nbd@nbd.name>
    Cc: stable@vger.kernel.org
    Signed-off-by: Thomas Martitz <t.martitz@avm.de>
    Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/bridge/br_private.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
    index ce2ab14ee6057..cecb4223440e7 100644
    --- a/net/bridge/br_private.h
    +++ b/net/bridge/br_private.h
    @@ -208,8 +208,8 @@ struct net_bridge_port_group {
    struct rcu_head rcu;
    struct timer_list timer;
    struct br_ip addr;
    + unsigned char eth_addr[ETH_ALEN] __aligned(2);
    unsigned char flags;
    - unsigned char eth_addr[ETH_ALEN];
    };

    struct net_bridge_mdb_entry {
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-29 21:56    [W:4.082 / U:0.588 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site