@@ -367,10 +367,23 @@ enum tcp_authopt_flag {
* Configure behavior of segments with TCP-AO coming from hosts for which no
* key is configured. The default recommended by RFC is to silently accept
* such connections.
*/
TCP_AUTHOPT_FLAG_REJECT_UNEXPECTED = (1 << 2),
+ /**
+ * @TCP_AUTHOPT_FLAG_ACTIVE: If authentication is active for a specific socket.
+ *
+ * TCP Authentication can be enabled but inactive on a socket if keys are
+ * only configured for destinations other than the peer.
+ *
+ * A listen socket with authentication enabled will return other sockets
+ * with authentication enabled on accept(). If no key is configured for the
+ * peer of an accepted socket then authentication will be inactive.
+ *
+ * This flag is readonly and the value is determined at connection establishment time.
+ */
+ TCP_AUTHOPT_FLAG_ACTIVE = (1 << 3),
};
/**
* struct tcp_authopt - Per-socket options related to TCP Authentication Option
*/
@@ -554,15 +554,23 @@ static struct tcp_authopt_info *__tcp_authopt_info_get_or_create(struct sock *sk
rcu_assign_pointer(tp->authopt_info, info);
return info;
}
-#define TCP_AUTHOPT_KNOWN_FLAGS ( \
+/* Flags fully controlled by user: */
+#define TCP_AUTHOPT_USER_FLAGS ( \
TCP_AUTHOPT_FLAG_LOCK_KEYID | \
TCP_AUTHOPT_FLAG_LOCK_RNEXTKEYID | \
TCP_AUTHOPT_FLAG_REJECT_UNEXPECTED)
+/* All known flags */
+#define TCP_AUTHOPT_KNOWN_FLAGS ( \
+ TCP_AUTHOPT_FLAG_LOCK_KEYID | \
+ TCP_AUTHOPT_FLAG_LOCK_RNEXTKEYID | \
+ TCP_AUTHOPT_FLAG_REJECT_UNEXPECTED | \
+ TCP_AUTHOPT_FLAG_ACTIVE)
+
/* Like copy_from_sockptr except tolerate different optlen for compatibility reasons
*
* If the src is shorter then it's from an old userspace and the rest of dst is
* filled with zeros.
*
@@ -627,11 +635,11 @@ int tcp_set_authopt(struct sock *sk, sockptr_t optval, unsigned int optlen)
info = __tcp_authopt_info_get_or_create(sk);
if (IS_ERR(info))
return PTR_ERR(info);
- info->flags = opt.flags & TCP_AUTHOPT_KNOWN_FLAGS;
+ info->flags = opt.flags & TCP_AUTHOPT_USER_FLAGS;
if (opt.flags & TCP_AUTHOPT_FLAG_LOCK_KEYID)
info->send_keyid = opt.send_keyid;
if (opt.flags & TCP_AUTHOPT_FLAG_LOCK_RNEXTKEYID)
info->send_rnextkeyid = opt.send_rnextkeyid;
@@ -641,10 +649,11 @@ int tcp_set_authopt(struct sock *sk, sockptr_t optval, unsigned int optlen)
int tcp_get_authopt_val(struct sock *sk, struct tcp_authopt *opt)
{
struct tcp_sock *tp = tcp_sk(sk);
struct tcp_authopt_info *info;
struct tcp_authopt_key_info *send_key;
+ bool anykey = false;
int err;
memset(opt, 0, sizeof(*opt));
sock_owned_by_me(sk);
err = check_sysctl_tcp_authopt();
@@ -653,11 +662,18 @@ int tcp_get_authopt_val(struct sock *sk, struct tcp_authopt *opt)
info = rcu_dereference_check(tp->authopt_info, lockdep_sock_is_held(sk));
if (!info)
return -ENOENT;
- opt->flags = info->flags & TCP_AUTHOPT_KNOWN_FLAGS;
+ opt->flags = info->flags & TCP_AUTHOPT_USER_FLAGS;
+
+ rcu_read_lock();
+ tcp_authopt_lookup_send(sock_net_tcp_authopt(sk), sk, -1, &anykey);
+ if (anykey)
+ opt->flags |= TCP_AUTHOPT_FLAG_ACTIVE;
+ rcu_read_unlock();
+
/* These keyids might be undefined, for example before connect.
* Reporting zero is not strictly correct because there are no reserved
* values.
*/
send_key = rcu_dereference_check(info->send_key, lockdep_sock_is_held(sk));
This can be used to determine if tcp authentication option is actually active on the current connection. TCP Authentication can be enabled but inactive on a socket if keys are only configured for destinations other than the peer. A listen socket with authentication enabled will return other sockets with authentication enabled on accept(). If no key is configured for the peer of an accepted socket then authentication will be inactive. Signed-off-by: Leonard Crestez <cdleonard@gmail.com> --- include/uapi/linux/tcp.h | 13 +++++++++++++ net/ipv4/tcp_authopt.c | 22 +++++++++++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-)