Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 8 insertions, 5 deletions

diff --git a/net/can/bcm.c b/net/can/bcm.c
index e8d58f33fe09..907dc871fac8 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -56,6 +56,7 @@
 #include <linux/can.h>
 #include <linux/can/core.h>
 #include <linux/can/bcm.h>
+#include <linux/slab.h>
 #include <net/sock.h>
 #include <net/net_namespace.h>
 
@@ -139,13 +140,13 @@ static char *bcm_proc_getifname(char *result, int ifindex)
         if (!ifindex)
                 return "any";
 
-        read_lock(&dev_base_lock);
-        dev = __dev_get_by_index(&init_net, ifindex);
+        rcu_read_lock();
+        dev = dev_get_by_index_rcu(&init_net, ifindex);
         if (dev)
                 strcpy(result, dev->name);
         else
                 strcpy(result, "???");
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
 
         return result;
 }
@@ -1478,6 +1479,9 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
         struct sock *sk = sock->sk;
         struct bcm_sock *bo = bcm_sk(sk);
 
+        if (len < sizeof(*addr))
+                return -EINVAL;
+
         if (bo->bound)
                 return -EISCONN;
 
@@ -1539,7 +1543,7 @@ static int bcm_recvmsg(struct kiocb *iocb, struct socket *sock,
                 return err;
         }
 
-        sock_recv_timestamp(msg, sk, skb);
+        sock_recv_ts_and_drops(msg, sk, skb);
 
         if (msg->msg_name) {
                 msg->msg_namelen = sizeof(struct sockaddr_can);
@@ -1581,7 +1585,6 @@ static struct proto bcm_proto __read_mostly = {
 static struct can_proto bcm_can_proto __read_mostly = {
         .type       = SOCK_DGRAM,
         .protocol   = CAN_BCM,
-        .capability = -1,
         .ops        = &bcm_ops,
         .prot       = &bcm_proto,
 };