netdev - Re: [PATCH v2 net-next 1/4] bnx2x: refactor nvram read procedure

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]

Date:	Fri, 19 Apr 2013 01:14:38 +0200
From:	Francois Romieu <romieu@...zoreil.com>
To:	Dmitry Kravkov <dmitry@...adcom.com>
Cc:	davem@...emloft.net, netdev@...r.kernel.org,
	Eilon Greenstein <eilong@...adcom.com>
Subject: Re: [PATCH v2 net-next 1/4] bnx2x: refactor nvram read procedure

Dmitry Kravkov <dmitry@...adcom.com> :
> introduce a procedure to read in u32 granularity.
> 
> CC: Francois Romieu <romieu@...zoreil.com>
> Signed-off-by: Dmitry Kravkov <dmitry@...adcom.com>
> Signed-off-by: Eilon Greenstein <eilong@...adcom.com>
> ---
>  .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    | 54 +++++++++++++---------
>  1 file changed, 31 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> index 129d6b2..e7e0ac1 100644
> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> @@ -1364,11 +1364,25 @@ static int bnx2x_nvram_read(struct bnx2x *bp, u32 offset, u8 *ret_buf,
>  	return rc;
>  }
>  
> +static int bnx2x_nvram_read32(struct bnx2x *bp, u32 offset, u32 *buf,
> +			      int buf_size)
> +{
> +	int i, rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
> +	__be32 *be = (__be32 *)buf;
> +
> +	if (rc)
> +		return rc;

Nit: one of those may be a tad more idiomatic. Not sure.

	__be32 *be = (__be32 *)buf;
	int i, rc;

	rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
	if (rc)
		...
or:
	int rc;

	rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
	if (!rc) {
		__be32 *be = (__be32 *)buf;

		while ((buf_size -= 4) >= 0)
			*buf++ = be32_to_cpu(*be++);
	}

[...]
> @@ -1383,9 +1397,7 @@ static int bnx2x_get_eeprom(struct net_device *dev,
>  
>  	/* parameters already validated in ethtool_get_eeprom */
>  
> -	rc = bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
> -
> -	return rc;
> +	return bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
>  }

Nit--: it's a bit off-topic.

[...]
> @@ -1573,16 +1584,16 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
>  
>  	cmd_flags = (MCPR_NVM_COMMAND_FIRST | MCPR_NVM_COMMAND_LAST);
>  	align_offset = (offset & ~0x03);
> -	rc = bnx2x_nvram_read_dword(bp, align_offset, &val, cmd_flags);
> +	rc = bnx2x_nvram_read_dword(bp, align_offset, &val_be, cmd_flags);
>  
> -	if (rc == 0) {
> -		val &= ~(0xff << BYTE_OFFSET(offset));
> -		val |= (*data_buf << BYTE_OFFSET(offset));
> +	/* nvram data is returned as an array of bytes
> +	 * convert it back to cpu order
> +	 */
> +	val = be32_to_cpu(val_be);

(1)

>  
> -		/* nvram data is returned as an array of bytes
> -		 * convert it back to cpu order
> -		 */
> -		val = be32_to_cpu(val);
> +	if (rc == 0) {
> +		val &= ~le32_to_cpu(0xff << BYTE_OFFSET(offset));
> +		val |= le32_to_cpu(*data_buf << BYTE_OFFSET(offset));

(2)

Either be32_to_cpu or le32_to_cpu above isn't a nop but the commit
message only talks of refactoring. It imho lacks a statement about
a fix.

-- 
Ueimor
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html