linux-kernel - Re: [PATCH 5.4 135/177] net: netcp: Fix an error message

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: <YLVYRMy9DTEsco+d@sashalap>
Date:   Mon, 31 May 2021 17:42:28 -0400
From:   Sasha Levin <sashal@...nel.org>
To:     Marion & Christophe JAILLET <christophe.jaillet@...adoo.fr>
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        linux-kernel@...r.kernel.org, stable@...r.kernel.org,
        "David S. Miller" <davem@...emloft.net>,
        Dan Carpenter <dan.carpenter@...cle.com>
Subject: Re: [PATCH 5.4 135/177] net: netcp: Fix an error message

On Mon, May 31, 2021 at 08:46:03PM +0200, Marion & Christophe JAILLET wrote:
>
>Le 31/05/2021 à 15:14, Greg Kroah-Hartman a écrit :
>>From: Christophe JAILLET <christophe.jaillet@...adoo.fr>
>>
>>[ Upstream commit ddb6e00f8413e885ff826e32521cff7924661de0 ]
>>
>>'ret' is known to be 0 here.
>>The expected error code is stored in 'tx_pipe->dma_queue', so use it
>>instead.
>>
>>While at it, switch from %d to %pe which is more user friendly.
>>
>>Fixes: 84640e27f230 ("net: netcp: Add Keystone NetCP core ethernet driver")
>>Signed-off-by: Christophe JAILLET <christophe.jaillet@...adoo.fr>
>>Signed-off-by: David S. Miller <davem@...emloft.net>
>>Signed-off-by: Sasha Levin <sashal@...nel.org>
>>---
>>  drivers/net/ethernet/ti/netcp_core.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>>diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
>>index 1b2702f74455..c0025bb8a584 100644
>>--- a/drivers/net/ethernet/ti/netcp_core.c
>>+++ b/drivers/net/ethernet/ti/netcp_core.c
>>@@ -1350,8 +1350,8 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe)
>>  	tx_pipe->dma_queue = knav_queue_open(name, tx_pipe->dma_queue_id,
>>  					     KNAV_QUEUE_SHARED);
>>  	if (IS_ERR(tx_pipe->dma_queue)) {
>>-		dev_err(dev, "Could not open DMA queue for channel \"%s\": %d\n",
>>-			name, ret);
>>+		dev_err(dev, "Could not open DMA queue for channel \"%s\": %pe\n",
>>+			name, tx_pipe->dma_queue);
>>  		ret = PTR_ERR(tx_pipe->dma_queue);
>>  		goto err;
>>  	}
>
>
>Hi,
>
>Apparently %pe is only supported up to (including) 5.5. It is not part 
>of 5.4.123.
>
>So this patch should not be backported here or should be backported 
>differently, ie:
>   leave dev_err as-is
>   move "ret = PTR_ERR(tx_pipe->dma_queue);" 1 line above

I'll fix it up the way you've described above. Thanks!

-- 
Thanks,
Sasha