1 files changed, 22 insertions, 20 deletions

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 882cde4b4047..a8d6625ec782 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -1,13 +1,13 @@
 /*
  *      Multicast support for IPv6
- *      Linux INET6 implementation 
+ *      Linux INET6 implementation
  *
  *      Authors:
- *      Pedro Roque             <roque@di.fc.ul.pt>     
+ *      Pedro Roque             <roque@di.fc.ul.pt>
  *
  *      $Id: mcast.c,v 1.40 2002/02/08 03:57:19 davem Exp $
  *
- *      Based on linux/ipv4/igmp.c and linux/ipv4/ip_sockglue.c 
+ *      Based on linux/ipv4/igmp.c and linux/ipv4/ip_sockglue.c
  *
  *      This program is free software; you can redistribute it and/or
  *      modify it under the terms of the GNU General Public License
@@ -644,7 +644,7 @@ int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,
                 memset(&ss, 0, sizeof(ss));
                 psin6->sin6_family = AF_INET6;
                 psin6->sin6_addr = psl->sl_addr[i];
-                if (copy_to_user(&optval->gf_slist[i], &ss, sizeof(ss)))
+                if (copy_to_user(&optval->gf_slist[i], &ss, sizeof(ss)))
                         return -EFAULT;
         }
         return 0;
@@ -1168,7 +1168,7 @@ int igmp6_event_query(struct sk_buff *skb)
 
         /* compute payload length excluding extension headers */
         len = ntohs(skb->nh.ipv6h->payload_len) + sizeof(struct ipv6hdr);
-        len -= (char *)skb->h.raw - (char *)skb->nh.ipv6h; 
+        len -= (char *)skb->h.raw - (char *)skb->nh.ipv6h;
 
         /* Drop queries with not link local source */
         if (!(ipv6_addr_type(&skb->nh.ipv6h->saddr)&IPV6_ADDR_LINKLOCAL))
@@ -1206,7 +1206,7 @@ int igmp6_event_query(struct sk_buff *skb)
                 /* clear deleted report items */
                 mld_clear_delrec(idev);
         } else if (len >= 28) {
-                int srcs_offset = sizeof(struct mld2_query) - 
+                int srcs_offset = sizeof(struct mld2_query) -
                                   sizeof(struct icmp6hdr);
                 if (!pskb_may_pull(skb, srcs_offset)) {
                         in6_dev_put(idev);
@@ -1230,7 +1230,7 @@ int igmp6_event_query(struct sk_buff *skb)
                 }
                 /* mark sources to include, if group & source-specific */
                 if (mlh2->nsrcs != 0) {
-                        if (!pskb_may_pull(skb, srcs_offset + 
+                        if (!pskb_may_pull(skb, srcs_offset +
                             ntohs(mlh2->nsrcs) * sizeof(struct in6_addr))) {
                                 in6_dev_put(idev);
                                 return -EINVAL;
@@ -1304,7 +1304,7 @@ int igmp6_event_report(struct sk_buff *skb)
 
         /* Drop reports with not link local source */
         addr_type = ipv6_addr_type(&skb->nh.ipv6h->saddr);
-        if (addr_type != IPV6_ADDR_ANY && 
+        if (addr_type != IPV6_ADDR_ANY &&
             !(addr_type&IPV6_ADDR_LINKLOCAL))
                 return -EINVAL;
 
@@ -1413,7 +1413,7 @@ static struct sk_buff *mld_newpack(struct net_device *dev, int size)
 
         if (ipv6_get_lladdr(dev, &addr_buf)) {
                 /* <draft-ietf-magma-mld-source-05.txt>:
-                 * use unspecified address as the source address 
+                 * use unspecified address as the source address
                  * when a valid link-local address is not available.
                  */
                 memset(&addr_buf, 0, sizeof(addr_buf));
@@ -1454,7 +1454,7 @@ static inline int mld_dev_queue_xmit2(struct sk_buff *skb)
 static inline int mld_dev_queue_xmit(struct sk_buff *skb)
 {
         return NF_HOOK(PF_INET6, NF_IP6_POST_ROUTING, skb, NULL, skb->dev,
-                       mld_dev_queue_xmit2);
+                       mld_dev_queue_xmit2);
 }
 
 static void mld_sendpack(struct sk_buff *skb)
@@ -1582,6 +1582,8 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,
                         skb = add_grhead(skb, pmc, type, &pgr);
                         first = 0;
                 }
+                if (!skb)
+                        return NULL;
                 psrc = (struct in6_addr *)skb_put(skb, sizeof(*psrc));
                 *psrc = psf->sf_addr;
                 scount++; stotal++;
@@ -1752,8 +1754,8 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
 {
         struct sock *sk = igmp6_socket->sk;
         struct inet6_dev *idev;
-        struct sk_buff *skb;
-        struct icmp6hdr *hdr;
+        struct sk_buff *skb;
+        struct icmp6hdr *hdr;
         struct in6_addr *snd_addr;
         struct in6_addr *addrp;
         struct in6_addr addr_buf;
@@ -1791,7 +1793,7 @@ static void igmp6_send(struct in6_addr *addr, struct net_device *dev, int type)
 
         if (ipv6_get_lladdr(dev, &addr_buf)) {
                 /* <draft-ietf-magma-mld-source-05.txt>:
-                 * use unspecified address as the source address 
+                 * use unspecified address as the source address
                  * when a valid link-local address is not available.
                  */
                 memset(&addr_buf, 0, sizeof(addr_buf));
@@ -2328,7 +2330,7 @@ static inline struct ifmcaddr6 *igmp6_mc_get_first(struct seq_file *seq)
         struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);
 
         for (state->dev = dev_base, state->idev = NULL;
-             state->dev; 
+             state->dev;
              state->dev = state->dev->next) {
                 struct inet6_dev *idev;
                 idev = in6_dev_get(state->dev);
@@ -2411,7 +2413,7 @@ static int igmp6_mc_seq_show(struct seq_file *seq, void *v)
         struct igmp6_mc_iter_state *state = igmp6_mc_seq_private(seq);
 
         seq_printf(seq,
-                   "%-4d %-15s " NIP6_SEQFMT " %5d %08X %ld\n", 
+                   "%-4d %-15s " NIP6_SEQFMT " %5d %08X %ld\n",
                    state->dev->ifindex, state->dev->name,
                    NIP6(im->mca_addr),
                    im->mca_users, im->mca_flags,
@@ -2449,7 +2451,7 @@ out_kfree:
         goto out;
 }
 
-static struct file_operations igmp6_mc_seq_fops = {
+static const struct file_operations igmp6_mc_seq_fops = {
         .owner          =       THIS_MODULE,
         .open           =       igmp6_mc_seq_open,
         .read           =       seq_read,
@@ -2472,7 +2474,7 @@ static inline struct ip6_sf_list *igmp6_mcf_get_first(struct seq_file *seq)
         struct igmp6_mcf_iter_state *state = igmp6_mcf_seq_private(seq);
 
         for (state->dev = dev_base, state->idev = NULL, state->im = NULL;
-             state->dev; 
+             state->dev;
              state->dev = state->dev->next) {
                 struct inet6_dev *idev;
                 idev = in6_dev_get(state->dev);
@@ -2577,7 +2579,7 @@ static int igmp6_mcf_seq_show(struct seq_file *seq, void *v)
         struct igmp6_mcf_iter_state *state = igmp6_mcf_seq_private(seq);
 
         if (v == SEQ_START_TOKEN) {
-                seq_printf(seq, 
+                seq_printf(seq,
                            "%3s %6s "
                            "%32s %32s %6s %6s\n", "Idx",
                            "Device", "Multicast Address",
@@ -2606,7 +2608,7 @@ static int igmp6_mcf_seq_open(struct inode *inode, struct file *file)
         struct seq_file *seq;
         int rc = -ENOMEM;
         struct igmp6_mcf_iter_state *s = kzalloc(sizeof(*s), GFP_KERNEL);
-        
+
         if (!s)
                 goto out;
 
@@ -2623,7 +2625,7 @@ out_kfree:
         goto out;
 }
 
-static struct file_operations igmp6_mcf_seq_fops = {
+static const struct file_operations igmp6_mcf_seq_fops = {
         .owner          =       THIS_MODULE,
         .open           =       igmp6_mcf_seq_open,
         .read           =       seq_read,