summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>2015-11-21 15:57:28 +0100
committerDavid S. Miller <davem@davemloft.net>2015-11-23 15:06:38 -0500
commitfe9ef3ce395d06e4f17e5995ab8455b9627f3306 (patch)
treee76b51d53a559afc69fe20e66fc4697041c3d4db
parent7ef8f65df976369588fa1b6466668b1b6a26eb3c (diff)
downloadlinux-fe9ef3ce395d06e4f17e5995ab8455b9627f3306.tar.bz2
net: ipmr: make ip_mroute_getsockopt more understandable
Use a switch to determine if optname is correct and set val accordingly. This produces a much more straight-forward and readable code. Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/ipmr.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 286ede3716ee..694fecf7838e 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1443,29 +1443,29 @@ int ip_mroute_getsockopt(struct sock *sk, int optname, char __user *optval, int
if (!mrt)
return -ENOENT;
- if (optname != MRT_VERSION &&
- optname != MRT_PIM &&
- optname != MRT_ASSERT)
+ switch (optname) {
+ case MRT_VERSION:
+ val = 0x0305;
+ break;
+ case MRT_PIM:
+ if (!pimsm_enabled())
+ return -ENOPROTOOPT;
+ val = mrt->mroute_do_pim;
+ break;
+ case MRT_ASSERT:
+ val = mrt->mroute_do_assert;
+ break;
+ default:
return -ENOPROTOOPT;
+ }
if (get_user(olr, optlen))
return -EFAULT;
-
olr = min_t(unsigned int, olr, sizeof(int));
if (olr < 0)
return -EINVAL;
-
if (put_user(olr, optlen))
return -EFAULT;
- if (optname == MRT_VERSION) {
- val = 0x0305;
- } else if (optname == MRT_PIM) {
- if (!pimsm_enabled())
- return -ENOPROTOOPT;
- val = mrt->mroute_do_pim;
- } else {
- val = mrt->mroute_do_assert;
- }
if (copy_to_user(optval, &val, olr))
return -EFAULT;
return 0;