Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

2 files changed, 19 insertions, 1 deletions

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index 42814a2ec9d7..b2c9becc02e8 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -167,7 +167,7 @@ config IPV6_SIT
           Tunneling means encapsulating data of one protocol type within
           another protocol and sending it over a channel that understands the
           encapsulating protocol. This driver implements encapsulation of IPv6
-          into IPv4 packets. This is useful if you want to connect two IPv6
+          into IPv4 packets. This is useful if you want to connect to IPv6
           networks over an IPv4-only path.
 
           Saying M here will produce a module called sit.ko. If unsure, say Y.
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 6193b124cbc7..396f0ea11090 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -971,6 +971,19 @@ static int do_rawv6_setsockopt(struct sock *sk, int level, int optname,
 
         switch (optname) {
                 case IPV6_CHECKSUM:
+                        if (inet_sk(sk)->num == IPPROTO_ICMPV6 &&
+                            level == IPPROTO_IPV6) {
+                                /*
+                                 * RFC3542 tells that IPV6_CHECKSUM socket
+                                 * option in the IPPROTO_IPV6 level is not
+                                 * allowed on ICMPv6 sockets.
+                                 * If you want to set it, use IPPROTO_RAW
+                                 * level IPV6_CHECKSUM socket option
+                                 * (Linux extension).
+                                 */
+                                return -EINVAL;
+                        }
+
                         /* You may get strange result with a positive odd offset;
                            RFC2292bis agrees with me. */
                         if (val > 0 && (val&1))
@@ -1046,6 +1059,11 @@ static int do_rawv6_getsockopt(struct sock *sk, int level, int optname,
 
         switch (optname) {
         case IPV6_CHECKSUM:
+                /*
+                 * We allow getsockopt() for IPPROTO_IPV6-level
+                 * IPV6_CHECKSUM socket option on ICMPv6 sockets
+                 * since RFC3542 is silent about it.
+                 */
                 if (rp->checksum == 0)
                         val = -1;
                 else