* [V2 PATCH] net: sock: validate data_len before allocating skb in sock_alloc_send_pskb()
@ 2012-05-31 7:18 Jason Wang
2012-05-31 22:21 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Jason Wang @ 2012-05-31 7:18 UTC (permalink / raw)
To: netdev, edumazet, mst, davem, linux-kernel; +Cc: stable
We need to validate the number of pages consumed by data_len, otherwise frags
array could be overflowed by userspace. So this patch validate data_len and
return -EMSGSIZE when data_len may occupies more frags than MAX_SKB_FRAGS.
Cc: stable@vger.kernel.org [2.6.27+]
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/core/sock.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/net/core/sock.c b/net/core/sock.c
index 653f8c0..9e5b71f 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1592,6 +1592,11 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
gfp_t gfp_mask;
long timeo;
int err;
+ int npages = (data_len + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
+
+ err = -EMSGSIZE;
+ if (npages > MAX_SKB_FRAGS)
+ goto failure;
gfp_mask = sk->sk_allocation;
if (gfp_mask & __GFP_WAIT)
@@ -1610,14 +1615,12 @@ struct sk_buff *sock_alloc_send_pskb(struct sock *sk, unsigned long header_len,
if (atomic_read(&sk->sk_wmem_alloc) < sk->sk_sndbuf) {
skb = alloc_skb(header_len, gfp_mask);
if (skb) {
- int npages;
int i;
/* No pages, we're done... */
if (!data_len)
break;
- npages = (data_len + (PAGE_SIZE - 1)) >> PAGE_SHIFT;
skb->truesize += data_len;
skb_shinfo(skb)->nr_frags = npages;
for (i = 0; i < npages; i++) {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [V2 PATCH] net: sock: validate data_len before allocating skb in sock_alloc_send_pskb()
2012-05-31 7:18 [V2 PATCH] net: sock: validate data_len before allocating skb in sock_alloc_send_pskb() Jason Wang
@ 2012-05-31 22:21 ` David Miller
2012-06-01 3:09 ` Jason Wang
0 siblings, 1 reply; 3+ messages in thread
From: David Miller @ 2012-05-31 22:21 UTC (permalink / raw)
To: jasowang; +Cc: netdev, edumazet, mst, linux-kernel, stable
From: Jason Wang <jasowang@redhat.com>
Date: Thu, 31 May 2012 15:18:10 +0800
> We need to validate the number of pages consumed by data_len, otherwise frags
> array could be overflowed by userspace. So this patch validate data_len and
> return -EMSGSIZE when data_len may occupies more frags than MAX_SKB_FRAGS.
>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Applied and queued up for -stable.
Please do not add explicit stable CC:'s to networking patches, I queue
appropriate changes up myself, and submit them only when I feel that
the change has had sufficient exposure and testing in Linus's tree.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [V2 PATCH] net: sock: validate data_len before allocating skb in sock_alloc_send_pskb()
2012-05-31 22:21 ` David Miller
@ 2012-06-01 3:09 ` Jason Wang
0 siblings, 0 replies; 3+ messages in thread
From: Jason Wang @ 2012-06-01 3:09 UTC (permalink / raw)
To: David Miller; +Cc: netdev, edumazet, mst, linux-kernel, stable
On 06/01/2012 06:21 AM, David Miller wrote:
> From: Jason Wang<jasowang@redhat.com>
> Date: Thu, 31 May 2012 15:18:10 +0800
>
>> We need to validate the number of pages consumed by data_len, otherwise frags
>> array could be overflowed by userspace. So this patch validate data_len and
>> return -EMSGSIZE when data_len may occupies more frags than MAX_SKB_FRAGS.
>>
>> Signed-off-by: Jason Wang<jasowang@redhat.com>
> Applied and queued up for -stable.
>
> Please do not add explicit stable CC:'s to networking patches, I queue
> appropriate changes up myself, and submit them only when I feel that
> the change has had sufficient exposure and testing in Linus's tree.
Sure, would pay attention next time.
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-06-01 3:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-31 7:18 [V2 PATCH] net: sock: validate data_len before allocating skb in sock_alloc_send_pskb() Jason Wang
2012-05-31 22:21 ` David Miller
2012-06-01 3:09 ` Jason Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).