netdev - Re: [PATCH net-next] net: enetc: use get/put_unaligned() for mac address handling

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <db1964cd-df60-08a2-1a66-8a8df7f14fef@gmail.com>
Date:   Fri, 4 Jun 2021 14:44:25 +0200
From:   Heiner Kallweit <hkallweit1@...il.com>
To:     Michael Walle <michael@...le.cc>, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Cc:     Claudiu Manoil <claudiu.manoil@....com>,
        "David S . Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Vladimir Oltean <vladimir.oltean@....com>
Subject: Re: [PATCH net-next] net: enetc: use get/put_unaligned() for mac
 address handling

On 04.06.2021 14:30, Michael Walle wrote:
> The supplied buffer for the MAC address might not be aligned. Thus
> doing a 32bit (or 16bit) access could be on an unaligned address. For
> now, enetc is only used on aarch64 which can do unaligned accesses, thus
> there is no error. In any case, be correct and use the get/put_unaligned()
> helpers.
> 
> Signed-off-by: Michael Walle <michael@...le.cc>
> ---
>  drivers/net/ethernet/freescale/enetc/enetc_pf.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf.c b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> index 31274325159a..a96d2acb5e11 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_pf.c
> @@ -1,6 +1,7 @@
>  // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
>  /* Copyright 2017-2019 NXP */
>  
> +#include <asm/unaligned.h>
>  #include <linux/mdio.h>
>  #include <linux/module.h>
>  #include <linux/fsl/enetc_mdio.h>
> @@ -17,15 +18,15 @@ static void enetc_pf_get_primary_mac_addr(struct enetc_hw *hw, int si, u8 *addr)
>  	u32 upper = __raw_readl(hw->port + ENETC_PSIPMAR0(si));
>  	u16 lower = __raw_readw(hw->port + ENETC_PSIPMAR1(si));
>  
> -	*(u32 *)addr = upper;
> -	*(u16 *)(addr + 4) = lower;
> +	put_unaligned(upper, (u32 *)addr);
> +	put_unaligned(lower, (u16 *)(addr + 4));

I think you want to write little endian, therefore on a BE platform
this code may be wrong. Better use put_unaligned_le32?
By using these versions of the unaligned helpers you could also
remove the pointer cast.

>  }
>  
>  static void enetc_pf_set_primary_mac_addr(struct enetc_hw *hw, int si,
>  					  const u8 *addr)
>  {
> -	u32 upper = *(const u32 *)addr;
> -	u16 lower = *(const u16 *)(addr + 4);
> +	u32 upper = get_unaligned((const u32 *)addr);
> +	u16 lower = get_unaligned((const u16 *)(addr + 4));
>  
>  	__raw_writel(upper, hw->port + ENETC_PSIPMAR0(si));
>  	__raw_writew(lower, hw->port + ENETC_PSIPMAR1(si));
>