From 91cfc36ce05991d739a50ec1c6d0e62c464b8855 Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Wed, 30 May 2012 21:18:10 +0000 Subject: [PATCH] --- yaml --- r: 310410 b: refs/heads/master c: cc9b17ad29ecaa20bfe426a8d4dbfb94b13ff1cc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/sock.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e1d28ad5d245..a718f9a78086 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 914bec1011a25f65cdc94988a6f974bfb9a3c10d +refs/heads/master: cc9b17ad29ecaa20bfe426a8d4dbfb94b13ff1cc diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 653f8c0aedc5..9e5b71fda6ec 100644 --- a/trunk/net/core/sock.c +++ b/trunk/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++) {