netdev - Re: [PATCH v1] net: amd-xgbe: Get rid of custom hex_dump_to

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] [day] [month] [year] [list]

Date:   Tue, 19 Dec 2017 15:16:41 -0600
From:   Tom Lendacky <thomas.lendacky@....com>
To:     Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org
Subject: Re: [PATCH v1] net: amd-xgbe: Get rid of custom hex_dump_to_buffer()

On 12/19/2017 12:02 PM, Andy Shevchenko wrote:
> Get rid of yet another custom hex_dump_to_buffer().
> 
> The output is slightly changed, i.e. each byte followed by white space.
> 
> Note, we don't use print_hex_dump() here since the original code uses
> nedev_dbg().
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
> ---
>  drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 23 ++++++-----------------
>  1 file changed, 6 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
> index a74a8fbad53a..fc58dc43a5bd 100644
> --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
> +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
> @@ -2930,9 +2930,8 @@ void xgbe_dump_rx_desc(struct xgbe_prv_data *pdata, struct xgbe_ring *ring,
>  void xgbe_print_pkt(struct net_device *netdev, struct sk_buff *skb, bool tx_rx)
>  {
>  	struct ethhdr *eth = (struct ethhdr *)skb->data;
> -	unsigned char *buf = skb->data;
>  	unsigned char buffer[128];
> -	unsigned int i, j;
> +	unsigned int i;
>  
>  	netdev_dbg(netdev, "\n************** SKB dump ****************\n");
>  
> @@ -2943,22 +2942,12 @@ void xgbe_print_pkt(struct net_device *netdev, struct sk_buff *skb, bool tx_rx)
>  	netdev_dbg(netdev, "Src MAC addr: %pM\n", eth->h_source);
>  	netdev_dbg(netdev, "Protocol: %#06hx\n", ntohs(eth->h_proto));
>  
> -	for (i = 0, j = 0; i < skb->len;) {
> -		j += snprintf(buffer + j, sizeof(buffer) - j, "%02hhx",
> -			      buf[i++]);
> -
> -		if ((i % 32) == 0) {
> -			netdev_dbg(netdev, "  %#06x: %s\n", i - 32, buffer);
> -			j = 0;
> -		} else if ((i % 16) == 0) {
> -			buffer[j++] = ' ';
> -			buffer[j++] = ' ';
> -		} else if ((i % 4) == 0) {
> -			buffer[j++] = ' ';
> -		}
> +	for (i = 0; i < skb->len; i += 32) {
> +		unsigned int len = min(skb->len - i, 32U);
> +
> +		hex_dump_to_buffer(&skb->data[i], len, 32, 1, buffer, 128, false);

I'd prefer to see sizeof(buffer) vs the hard-coded 128 here.  Also, this
line exceeds 80 characters, so it should be split.

With those changes:

Acked-by: Tom Lendacky <thomas.lendacky@....com>

> +		netdev_dbg(netdev, "  %#06x: %s\n", i, buffer);
>  	}
> -	if (i % 32)
> -		netdev_dbg(netdev, "  %#06x: %s\n", i - (i % 32), buffer);
>  
>  	netdev_dbg(netdev, "\n************** SKB dump ****************\n");
>  }
>