6 files changed, 26 insertions, 17 deletions

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 84b9af76f0a2..3a13ed643459 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -831,7 +831,7 @@ static int translate_table(struct ebt_replace *repl,
                         return -ENOMEM;
                 for_each_possible_cpu(i) {
                         newinfo->chainstack[i] =
-                           vmalloc(udc_cnt * sizeof(struct ebt_chainstack));
+                          vmalloc(udc_cnt * sizeof(*(newinfo->chainstack[0])));
                         if (!newinfo->chainstack[i]) {
                                 while (i)
                                         vfree(newinfo->chainstack[--i]);
@@ -841,8 +841,7 @@ static int translate_table(struct ebt_replace *repl,
                         }
                 }
 
-                cl_s = (struct ebt_cl_stack *)
-                   vmalloc(udc_cnt * sizeof(struct ebt_cl_stack));
+                cl_s = vmalloc(udc_cnt * sizeof(*cl_s));
                 if (!cl_s)
                         return -ENOMEM;
                 i = 0; /* the i'th udc */
@@ -944,8 +943,7 @@ static int do_replace(void __user *user, unsigned int len)
 
         countersize = COUNTER_OFFSET(tmp.nentries) * 
                                         (highest_possible_processor_id()+1);
-        newinfo = (struct ebt_table_info *)
-           vmalloc(sizeof(struct ebt_table_info) + countersize);
+        newinfo = vmalloc(sizeof(*newinfo) + countersize);
         if (!newinfo)
                 return -ENOMEM;
 
@@ -967,8 +965,7 @@ static int do_replace(void __user *user, unsigned int len)
         /* the user wants counters back
            the check on the size is done later, when we have the lock */
         if (tmp.num_counters) {
-                counterstmp = (struct ebt_counter *)
-                   vmalloc(tmp.num_counters * sizeof(struct ebt_counter));
+                counterstmp = vmalloc(tmp.num_counters * sizeof(*counterstmp));
                 if (!counterstmp) {
                         ret = -ENOMEM;
                         goto free_entries;
@@ -1148,8 +1145,7 @@ int ebt_register_table(struct ebt_table *table)
 
         countersize = COUNTER_OFFSET(table->table->nentries) *
                                         (highest_possible_processor_id()+1);
-        newinfo = (struct ebt_table_info *)
-           vmalloc(sizeof(struct ebt_table_info) + countersize);
+        newinfo = vmalloc(sizeof(*newinfo) + countersize);
         ret = -ENOMEM;
         if (!newinfo)
                 return -ENOMEM;
@@ -1247,8 +1243,7 @@ static int update_counters(void __user *user, unsigned int len)
         if (hlp.num_counters == 0)
                 return -EINVAL;
 
-        if ( !(tmp = (struct ebt_counter *)
-           vmalloc(hlp.num_counters * sizeof(struct ebt_counter))) ){
+        if (!(tmp = vmalloc(hlp.num_counters * sizeof(*tmp)))) {
                 MEMPRINT("Update_counters && nomemory\n");
                 return -ENOMEM;
         }
@@ -1377,8 +1372,7 @@ static int copy_everything_to_user(struct ebt_table *t, void __user *user,
                         BUGPRINT("Num_counters wrong\n");
                         return -EINVAL;
                 }
-                counterstmp = (struct ebt_counter *)
-                   vmalloc(nentries * sizeof(struct ebt_counter));
+                counterstmp = vmalloc(nentries * sizeof(*counterstmp));
                 if (!counterstmp) {
                         MEMPRINT("Couldn't copy counters, out of memory\n");
                         return -ENOMEM;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 09464fa8d72f..fb3770f9c094 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -112,6 +112,14 @@ void skb_under_panic(struct sk_buff *skb, int sz, void *here)
         BUG();
 }
 
+void skb_truesize_bug(struct sk_buff *skb)
+{
+        printk(KERN_ERR "SKB BUG: Invalid truesize (%u) "
+               "len=%u, sizeof(sk_buff)=%Zd\n",
+               skb->truesize, skb->len, sizeof(struct sk_buff));
+}
+EXPORT_SYMBOL(skb_truesize_bug);
+
 /*      Allocate a new skbuff. We do this ourselves so we can fill in a few
  *      'private' fields and also do memory statistics to find all the
  *      [BEEP] leaks.
diff --git a/net/core/stream.c b/net/core/stream.c
index 35e25259fd95..e9489696f694 100644
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -176,6 +176,7 @@ void sk_stream_rfree(struct sk_buff *skb)
 {
         struct sock *sk = skb->sk;
 
+        skb_truesize_check(skb);
         atomic_sub(skb->truesize, &sk->sk_rmem_alloc);
         sk->sk_forward_alloc += skb->truesize;
 }
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 44df1db726a3..a28ae593b976 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -533,6 +533,7 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
         struct tcp_sock *tp = tcp_sk(sk);
         struct sk_buff *buff;
         int nsize, old_factor;
+        int nlen;
         u16 flags;
 
         BUG_ON(len > skb->len);
@@ -552,8 +553,10 @@ int tcp_fragment(struct sock *sk, struct sk_buff *skb, u32 len, unsigned int mss
         if (buff == NULL)
                 return -ENOMEM; /* We'll just try again later. */
 
-        buff->truesize = skb->len - len;
-        skb->truesize -= buff->truesize;
+        sk_charge_skb(sk, buff);
+        nlen = skb->len - len - nsize;
+        buff->truesize += nlen;
+        skb->truesize -= nlen;
 
         /* Correct the sequence numbers. */
         TCP_SKB_CB(buff)->seq = TCP_SKB_CB(skb)->seq + len;
@@ -1039,7 +1042,8 @@ static int tso_fragment(struct sock *sk, struct sk_buff *skb, unsigned int len,
         if (unlikely(buff == NULL))
                 return -ENOMEM;
 
-        buff->truesize = nlen;
+        sk_charge_skb(sk, buff);
+        buff->truesize += nlen;
         skb->truesize -= nlen;
 
         /* Correct the sequence numbers. */
diff --git a/net/llc/llc_input.c b/net/llc/llc_input.c
index 8f3addf0724c..d62e0f9b9da3 100644
--- a/net/llc/llc_input.c
+++ b/net/llc/llc_input.c
@@ -118,7 +118,8 @@ static inline int llc_fixup_skb(struct sk_buff *skb)
                 u16 pdulen = eth_hdr(skb)->h_proto,
                     data_size = ntohs(pdulen) - llc_len;
 
-                skb_trim(skb, data_size);
+                if (unlikely(pskb_trim_rcsum(skb, data_size)))
+                        return 0;
         }
         return 1;
 }
diff --git a/net/socket.c b/net/socket.c
index 23898f45f713..0ce12dfc7a71 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -490,6 +490,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
         struct file *file;
         struct socket *sock;
 
+        *err = -EBADF;
         file = fget_light(fd, fput_needed);
         if (file) {
                 sock = sock_from_file(file, err);