diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-05 21:55:59 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-05 21:55:59 (GMT) |
commit | c1226ff9af84dfa6ef73d95435748569c99b5171 (patch) | |
tree | 794411d5da7c34abafe0e188e499cd8334492ce6 /net/ipv6/ip6mr.c | |
parent | 51f29d44414521cc4244958f2a384bcd39d23a6e (diff) | |
parent | c8d4bafe503ca767bbc8f3c54e4acd344ef26346 (diff) | |
download | linux-c1226ff9af84dfa6ef73d95435748569c99b5171.tar.xz |
Merge tag 'omap-for-v3.9/fixes-non-critical-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
From Tony Lindgren:
Few fixes for v3.9 merge window that are not urgent for
the -rc series.
* tag 'omap-for-v3.9/fixes-non-critical-signed-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: using strlcpy instead of strncpy
ARM: OMAP2+: Fix selection of clockevent timer when using device-tree
ARM: OMAP: Fix the use of uninitialized dma_lch_count
ARM: OMAP: make wakeupgen_lock raw
+ Linux 3.8-rc6
Diffstat (limited to 'net/ipv6/ip6mr.c')
-rw-r--r-- | net/ipv6/ip6mr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c index 26dcdec..8fd154e 100644 --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c @@ -1710,6 +1710,9 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, uns return -EINVAL; if (get_user(v, (u32 __user *)optval)) return -EFAULT; + /* "pim6reg%u" should not exceed 16 bytes (IFNAMSIZ) */ + if (v != RT_TABLE_DEFAULT && v >= 100000000) + return -EINVAL; if (sk == mrt->mroute6_sk) return -EBUSY; |