netdev - Re: [PATCH] Build fixes for skb_frag

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]

Message-Id: <20190726.141053.972271542982124792.davem@davemloft.net>
Date:   Fri, 26 Jul 2019 14:10:53 -0700 (PDT)
From:   David Miller <davem@...emloft.net>
To:     arnd@...db.de
Cc:     willy@...radead.org, netdev@...r.kernel.org
Subject: Re: [PATCH] Build fixes for skb_frag_size conversion

From: Arnd Bergmann <arnd@...db.de>
Date: Thu, 25 Jul 2019 13:08:18 +0200

> On Wed, Jul 24, 2019 at 1:37 PM Matthew Wilcox <willy@...radead.org> wrote:
>>
>> From: "Matthew Wilcox (Oracle)" <willy@...radead.org>
>>
>> I missed a few places.  One is in some ifdeffed code which will probably
>> never be re-enabled; the others are in drivers which can't currently be
>> compiled on x86.
>>
>> Signed-off-by: Matthew Wilcox (Oracle) <willy@...radead.org>
> 
>> diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
>> index cc12c78f73f1..46a6fcf1414d 100644
>> --- a/drivers/staging/octeon/ethernet-tx.c
>> +++ b/drivers/staging/octeon/ethernet-tx.c
>> @@ -284,7 +284,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
>>
>>                         hw_buffer.s.addr =
>>                                 XKPHYS_TO_PHYS((u64)skb_frag_address(fs));
>> -                       hw_buffer.s.size = fs->size;
>> +                       hw_buffer.s.size = skb_drag_size(fs);
>>                         CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64;
>>                 }
>>                 hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)CVM_OCT_SKB_CB(skb));
> 
> Kernelci noticed a build failure from a typo here:
> https://kernelci.org/build/id/5d3943f859b514103f688918/logs/

I just checked this into net-next:

====================
>From 1fbf400b58fa70c35bf671ff640b83799e45388d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@...emloft.net>
Date: Fri, 26 Jul 2019 14:10:30 -0700
Subject: [PATCH] staging: octeon: Fix build failure due to typo.

drivers/staging/octeon/ethernet-tx.c:287:23: error: implicit declaration of function 'skb_drag_size'; did you mean 'skb_frag_size'? [-Werror=implicit-function-declaration]

>From kernelci report:

	https://kernelci.org/build/id/5d3943f859b514103f688918/logs/

Fixes: 92493a2f8a8d ("Build fixes for skb_frag_size conversion")
Signed-off-by: David S. Miller <davem@...emloft.net>
---
 drivers/staging/octeon/ethernet-tx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c
index 46a6fcf1414d..44f79cd32750 100644
--- a/drivers/staging/octeon/ethernet-tx.c
+++ b/drivers/staging/octeon/ethernet-tx.c
@@ -284,7 +284,7 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev)
 
 			hw_buffer.s.addr =
 				XKPHYS_TO_PHYS((u64)skb_frag_address(fs));
-			hw_buffer.s.size = skb_drag_size(fs);
+			hw_buffer.s.size = skb_frag_size(fs);
 			CVM_OCT_SKB_CB(skb)[i + 1] = hw_buffer.u64;
 		}
 		hw_buffer.s.addr = XKPHYS_TO_PHYS((u64)CVM_OCT_SKB_CB(skb));
-- 
2.20.1