From 46e00bc70f04b1e8fd8bf39730a39b254364e8b6 Mon Sep 17 00:00:00 2001 From: Eldad Zack Date: Sun, 1 Apr 2012 07:49:03 +0000 Subject: [PATCH] --- yaml --- r: 300429 b: refs/heads/master c: b5a4257cef5e8d6efb2ac9322b00377279ffd234 h: refs/heads/master i: 300427: 849b92e16f5fb5eaacd3db905eca33877de895e4 v: v3 --- [refs] | 2 +- trunk/net/ipv6/datagram.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 00405dd9da2e..7d6a893ca9e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d94d34a0664b296fd1593a96ccc9c97a94dfd43d +refs/heads/master: b5a4257cef5e8d6efb2ac9322b00377279ffd234 diff --git a/trunk/net/ipv6/datagram.c b/trunk/net/ipv6/datagram.c index 76832c8dc89d..f6210d6fd7d8 100644 --- a/trunk/net/ipv6/datagram.c +++ b/trunk/net/ipv6/datagram.c @@ -98,7 +98,7 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) sin.sin_port = usin->sin6_port; err = ip4_datagram_connect(sk, - (struct sockaddr*) &sin, + (struct sockaddr *) &sin, sizeof(sin)); ipv4_connected: @@ -518,7 +518,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb) unsigned len; u8 *ptr = nh + off; - switch(nexthdr) { + switch (nexthdr) { case IPPROTO_DSTOPTS: nexthdr = ptr[0]; len = (ptr[1] + 1) << 3; @@ -827,9 +827,8 @@ int datagram_send_ctl(struct net *net, struct sock *sk, int tc; err = -EINVAL; - if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) { + if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) goto exit_f; - } tc = *(int *)CMSG_DATA(cmsg); if (tc < -1 || tc > 0xff) @@ -846,9 +845,8 @@ int datagram_send_ctl(struct net *net, struct sock *sk, int df; err = -EINVAL; - if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) { + if (cmsg->cmsg_len != CMSG_LEN(sizeof(int))) goto exit_f; - } df = *(int *)CMSG_DATA(cmsg); if (df < 0 || df > 1)