inet: Add getsockopt support for IP_ROUTER_ALERT and IPV6_ROUTER_ALERT

Currently getsockopt does not support IP_ROUTER_ALERT and
IPV6_ROUTER_ALERT, and we are unable to get the values of these two
socket options through getsockopt.

This patch adds getsockopt support for IP_ROUTER_ALERT and
IPV6_ROUTER_ALERT.

Signed-off-by: Juntong Deng <juntong.deng@outlook.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index d94c242eb3ed20b2c5b2e5ceea3953cf96341fb7..f9ddd47dc4f8d989e1c966bf363ed846c0911639 100644 (file)
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -274,6 +274,7 @@ enum {
        INET_FLAGS_REPFLOW      = 27,
        INET_FLAGS_RTALERT_ISOLATE = 28,
        INET_FLAGS_SNDFLOW      = 29,
+       INET_FLAGS_RTALERT      = 30,
 };
 
 /* cmsg flags for inet */

diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
index 21d2ffa919e98b41ed325f978ae573b9f25f4d71..cf377377b52d83fbc7ac979b02b5ca9a7d9abf4a 100644 (file)
--- a/net/ipv4/ip_sockglue.c
+++ b/net/ipv4/ip_sockglue.c
@@ -894,7 +894,7 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname,
 {
        struct inet_sock *inet = inet_sk(sk);
        struct net *net = sock_net(sk);
-       int val = 0, err;
+       int val = 0, err, retv;
        bool needs_rtnl = setsockopt_needs_rtnl(optname);
 
        switch (optname) {
@@ -938,8 +938,12 @@ int do_ip_setsockopt(struct sock *sk, int level, int optname,
 
        /* If optlen==0, it is equivalent to val == 0 */
 
-       if (optname == IP_ROUTER_ALERT)
-               return ip_ra_control(sk, val ? 1 : 0, NULL);
+       if (optname == IP_ROUTER_ALERT) {
+               retv = ip_ra_control(sk, val ? 1 : 0, NULL);
+               if (retv == 0)
+                       inet_assign_bit(RTALERT, sk, val);
+               return retv;
+       }
        if (ip_mroute_opt(optname))
                return ip_mroute_setsockopt(sk, optname, optval, optlen);
 
@@ -1575,6 +1579,9 @@ int do_ip_getsockopt(struct sock *sk, int level, int optname,
        case IP_BIND_ADDRESS_NO_PORT:
                val = inet_test_bit(BIND_ADDRESS_NO_PORT, sk);
                goto copyval;
+       case IP_ROUTER_ALERT:
+               val = inet_test_bit(RTALERT, sk);
+               goto copyval;
        case IP_TTL:
                val = READ_ONCE(inet->uc_ttl);
                if (val < 0)

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index f61d977ac0528e190d901c9b5e71b1cf358096bd..d4c28ec1bc517b33498b08b59bcda5fe960f652f 100644 (file)
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -948,6 +948,8 @@ done:
                if (optlen < sizeof(int))
                        goto e_inval;
                retv = ip6_ra_control(sk, val);
+               if (retv == 0)
+                       inet6_assign_bit(RTALERT, sk, valbool);
                break;
        case IPV6_FLOWLABEL_MGR:
                retv = ipv6_flowlabel_opt(sk, optval, optlen);
@@ -1445,6 +1447,10 @@ int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
                val = np->rxopt.bits.recvfragsize;
                break;
 
+       case IPV6_ROUTER_ALERT:
+               val = inet6_test_bit(RTALERT, sk);
+               break;
+
        case IPV6_ROUTER_ALERT_ISOLATE:
                val = inet6_test_bit(RTALERT_ISOLATE, sk);
                break;