Skip to contentSkip to conversation

net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

PATCH Applied Wen Gong 4 participants 8 messages Jan 3, 2020 – Mar 19, 2020

Subsystems (5)
lore
Share & tools
lore

Wen Gong

author
#0 lore raw

PATCH v2 1/1 net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

From: Carl Huang <[email protected]>

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

In qrtr_node_enqueue, local variable size_t len is assign with skb->len, then skb_push(skb, sizeof(*hdr)) will add skb->len with sizeof(*hdr), so local variable size_t len is not same with skb->len after skb_push(skb, sizeof(*hdr)).

Then the purpose of skb_put_padto(skb, ALIGN(len, 4)) is to add add pad to the end of the skb's data if skb->len is not aligned to 4, but unfortunately it use len instead of skb->len, at this line, skb->len is 32 bytes(sizeof(*hdr)) more than len, for example, len is 3 bytes, then skb->len is 35 bytes(3 + 32), and ALIGN(len, 4) is 4 bytes, so __skb_put_padto will do nothing after check size(35) < len(4), the correct value should be 36(sizeof(*hdr) + ALIGN(len, 4) = 32 + 4), then __skb_put_padto will pass check size(35) < len(36) and add 1 byte to the end of skb's data, then logic is correct.

function of skb_push:
void *skb_push(struct sk_buff *skb, unsigned int len)

{
	skb->data -= len;
	skb->len  += len;
	if (unlikely(skb->data < skb->head))
		skb_under_panic(skb, len, __builtin_return_address(0));
	return skb->data;
}

function of skb_put_padto
static inline int skb_put_padto(struct sk_buff *skb, unsigned int len)

{
	return __skb_put_padto(skb, len, true);
}

function of __skb_put_padto
static inline int __skb_put_padto(struct sk_buff *skb, unsigned int len,
bool free_on_error)

{
	unsigned int size = skb->len;

	if (unlikely(size < len)) {
		len -= size;
		if (__skb_pad(skb, len, free_on_error))
			return -ENOMEM;
		__skb_put(skb, len);
	}
	return 0;
}

---
v2: change description

 net/qrtr/qrtr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/qrtr/qrtr.c +1 -1
index 88f98f27ad88..3d24d45be5f4 100644
@@ -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)
Signature · 1 line
2.23.0
maintainer Applied
#1 lore raw

From: Wen Gong <[email protected]>
Date: Fri, 3 Jan 2020 12:50:16 +0800

Quoted 1 line

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

Thanks, applied.

There is another bug here, skb_put_padto() returns an error and frees the SKB when the put fails. There really needs to be a check here, because currently the code right now will keep using the freed up skb in that situation.

Thanks.

_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k

author
#2 lore raw
Quoted 12 lines · David Miller

From: Wen Gong <[email protected]>
Date: Fri, 3 Jan 2020 12:50:16 +0800

Quoted 1 line

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

Thanks, applied.

There is another bug here, skb_put_padto() returns an error and frees the SKB when the put fails. There really needs to be a check here, because currently the code right now will keep using the freed up skb in that situation.

Thanks David.

Yes, __skb_put_padto will return -ENOMEM if __skb_pad fail.
I think it can return the same error immediately and do not do the next steps in qrtr_node_enqueue.

Quoted 1 line

Thanks.

_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k

#3 lore raw
In reply to David Miller

Hi,

Quoted 7 lines · David Miller

From: Wen Gong <[email protected]>
Date: Fri, 3 Jan 2020 12:50:16 +0800

Quoted 1 line

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

Thanks, applied.

I noticed this patch is in mainline now as:

ce57785bf91b net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

Though I'm not an expert on the code, it feels like a stable candidate unless someone objects.

-Doug

_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k

maintainer
#4 lore raw

From: Doug Anderson <[email protected]>
Date: Tue, 25 Feb 2020 14:52:24 -0800

Quoted 6 lines

I noticed this patch is in mainline now as:

ce57785bf91b net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

Though I'm not an expert on the code, it feels like a stable candidate unless someone objects.

Ok, queued up, thanks.

#5 lore raw
In reply to Doug Anderson
Quoted 10 lines · Doug Anderson

Hi,

Quoted 6 lines · David Miller

From: Wen Gong <[email protected]>
Date: Fri, 3 Jan 2020 12:50:16 +0800

Quoted 1 line

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

Quoted 8 lines
Quoted 1 line

Thanks, applied.

I noticed this patch is in mainline now as:

ce57785bf91b net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

Though I'm not an expert on the code, it feels like a stable candidate unless someone objects.

Stable candidate for what tree(s)?

thanks,

greg k-h

#6 lore raw

Hi,

Quoted 14 lines · Greg KH
Quoted 12 lines · Doug Anderson

Hi,

Quoted 7 lines · David Miller

From: Wen Gong <[email protected]>
Date: Fri, 3 Jan 2020 12:50:16 +0800

Quoted 1 line

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

Thanks, applied.

Quoted 8 lines
Quoted 6 lines

I noticed this patch is in mainline now as:

ce57785bf91b net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

Though I'm not an expert on the code, it feels like a stable candidate unless someone objects.

Stable candidate for what tree(s)?

I noticed that it was lacking and applied cleanly on 5.4. As of 5.4.25 it's still not stable there. I only noticed it because I was comparing all the patches in mainline in "net/qrtr" with what we had in our tree and stumbled upon this one.

Looking at it a little more carefully, I guess you could say:

Fixes e7044482c8ac ("net: qrtr: Pass source and destination to

enqueue functions")

...though it will be trickier to apply past commit 194ccc88297a ("net:
qrtr: Support decoding incoming v2 packets") just because the math changed.

-Doug

Applied
#7 lore raw
Quoted 31 lines · Doug Anderson

Hi,

Quoted 14 lines · Greg KH
Quoted 12 lines · Doug Anderson

Hi,

Quoted 7 lines · David Miller

From: Wen Gong <[email protected]>
Date: Fri, 3 Jan 2020 12:50:16 +0800

Quoted 1 line

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

Thanks, applied.

Quoted 8 lines
Quoted 6 lines

I noticed this patch is in mainline now as:

ce57785bf91b net: qrtr: fix len of skb_put_padto in qrtr_node_enqueue

Though I'm not an expert on the code, it feels like a stable candidate unless someone objects.

Stable candidate for what tree(s)?

I noticed that it was lacking and applied cleanly on 5.4. As of 5.4.25 it's still not stable there. I only noticed it because I was comparing all the patches in mainline in "net/qrtr" with what we had in our tree and stumbled upon this one.

Quoted 8 lines

Looking at it a little more carefully, I guess you could say:

Fixes e7044482c8ac ("net: qrtr: Pass source and destination to

enqueue functions")

...though it will be trickier to apply past commit 194ccc88297a ("net:
qrtr: Support decoding incoming v2 packets") just because the math changed.

Given that both of those commits showed up in 4.15, it doesn't matter much :)

I've queued this up for 5.4.y and 4.19.y now, thanks.

greg k-h