[PATCH] net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

[PATCH] net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

[Wen Gong]

From: Carl Huang <cjhuang@codeaurora.org>

The len used for skb_put_padto is wrong, it need to add len of hdr.

Signed-off-by: Carl Huang <cjhuang@codeaurora.org>
Signed-off-by: Wen Gong <wgong@codeaurora.org>
---
 net/qrtr/qrtr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c
index 88f98f27ad88..3d24d45be5f4 100644
--- a/net/qrtr/qrtr.c
+++ b/net/qrtr/qrtr.c
@@ -196,7 +196,7 @@ static int qrtr_node_enqueue(struct qrtr_node *node, struct sk_buff *skb,
 	hdr->size = cpu_to_le32(len);
 	hdr->confirm_rx = 0;
 
-	skb_put_padto(skb, ALIGN(len, 4));
+	skb_put_padto(skb, ALIGN(len, 4) + sizeof(*hdr));
 
 	mutex_lock(&node->ep_lock);
 	if (node->ep)
-- 
2.23.0

Re: [PATCH] net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

[David Miller]

From: Wen Gong <wgong@codeaurora.org>
Date: Tue, 31 Dec 2019 17:32:42 +0800

> From: Carl Huang <cjhuang@codeaurora.org>
> 
> The len used for skb_put_padto is wrong, it need to add len of hdr.
> 
> Signed-off-by: Carl Huang <cjhuang@codeaurora.org>
> Signed-off-by: Wen Gong <wgong@codeaurora.org>
 ...
> @@ -196,7 +196,7 @@ static int qrtr_node_enqueue(struct qrtr_node *node, struct sk_buff *skb,
>  	hdr->size = cpu_to_le32(len);
>  	hdr->confirm_rx = 0;
>  
> -	skb_put_padto(skb, ALIGN(len, 4));
> +	skb_put_padto(skb, ALIGN(len, 4) + sizeof(*hdr));

I don't think this is correct.

The 'hdr' was already "pushed" earlier in this file.

Here we are padding the area after the header, which is being "put".

I'm not applying this.  If you still think it is correct, you must explain
in detail why it is and add that description to the commit log message.

Thank you.

Re: [PATCH] net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

[Wen Gong]

On 2020-01-03 08:22, David Miller wrote:

> I don't think this is correct.
> 
> The 'hdr' was already "pushed" earlier in this file.
> 
> Here we are padding the area after the header, which is being "put".
> 
> I'm not applying this.  If you still think it is correct, you must 
> explain
> in detail why it is and add that description to the commit log message.
> 
> Thank you.

Thanks David.
I will add more description and send patch v2.

Re: [PATCH] net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

[Wen Gong]

On 2020-01-03 09:37, Wen Gong wrote:
> On 2020-01-03 08:22, David Miller wrote:
> 
>> I don't think this is correct.
>> 
>> The 'hdr' was already "pushed" earlier in this file.
>> 
>> Here we are padding the area after the header, which is being "put".
>> 
>> I'm not applying this.  If you still think it is correct, you must 
>> explain
>> in detail why it is and add that description to the commit log 
>> message.
>> 
>> Thank you.
> 
> Thanks David.
> I will add more description and send patch v2.
v2:
http://patchwork.ozlabs.org/patch/1217201/