@@ -231,10 +231,12 @@ static inline void tcp_authopt_update_snd_sne(struct tcp_sock *tp, u32 seq)
lockdep_sock_is_held((struct sock *)tp));
if (info)
__tcp_authopt_update_snd_sne(tp, info, seq);
}
}
+int tcp_get_authopt_repair_val(struct sock *sk, struct tcp_authopt_repair *opt);
+int tcp_set_authopt_repair(struct sock *sk, sockptr_t optval, unsigned int optlen);
#else
static inline void tcp_authopt_clear(struct sock *sk)
{
}
static inline int tcp_authopt_openreq(struct sock *newsk,
@@ -128,10 +128,11 @@ enum {
#define TCP_CM_INQ TCP_INQ
#define TCP_TX_DELAY 37 /* delay outgoing packets by XX usec */
#define TCP_AUTHOPT 38 /* TCP Authentication Option (RFC5925) */
#define TCP_AUTHOPT_KEY 39 /* TCP Authentication Option Key (RFC5925) */
+#define TCP_REPAIR_AUTHOPT 40
#define TCP_REPAIR_ON 1
#define TCP_REPAIR_OFF 0
#define TCP_REPAIR_OFF_NO_WP -1 /* Turn off without window probes */
@@ -490,10 +491,24 @@ struct tcp_authopt_key {
* address match is performed.
*/
int prefixlen;
};
+/**
+ * struct tcp_authopt_repair - TCP_REPAIR information related to Authentication Option
+ * @src_isn: Local Initial Sequence Number
+ * @dst_isn: Remote Initial Sequence Number
+ * @snd_sne: Sequence Number Extension for Send (upper 32 bits of snd_nxt)
+ * @rcv_sne: Sequence Number Extension for Recv (upper 32 bits of rcv_nxt)
+ */
+struct tcp_authopt_repair {
+ __u32 src_isn;
+ __u32 dst_isn;
+ __u32 snd_sne;
+ __u32 rcv_sne;
+};
+
/* setsockopt(fd, IPPROTO_TCP, TCP_ZEROCOPY_RECEIVE, ...) */
#define TCP_RECEIVE_ZEROCOPY_FLAG_TLB_CLEAN_HINT 0x1
struct tcp_zerocopy_receive {
__u64 address; /* in: address of mapping */
@@ -3675,10 +3675,13 @@ static int do_tcp_setsockopt(struct sock *sk, int level, int optname,
err = tcp_set_authopt(sk, optval, optlen);
break;
case TCP_AUTHOPT_KEY:
err = tcp_set_authopt_key(sk, optval, optlen);
break;
+ case TCP_REPAIR_AUTHOPT:
+ err = tcp_set_authopt_repair(sk, optval, optlen);
+ break;
#endif
case TCP_USER_TIMEOUT:
/* Cap the max time in ms TCP will retry or probe the window
* before giving up and aborting (ETIMEDOUT) a connection.
*/
@@ -4347,10 +4350,30 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
return -EFAULT;
if (copy_to_user(optval, &info, len))
return -EFAULT;
return 0;
}
+ case TCP_REPAIR_AUTHOPT: {
+ struct tcp_authopt_repair val;
+ int err;
+
+ if (get_user(len, optlen))
+ return -EFAULT;
+
+ lock_sock(sk);
+ err = tcp_get_authopt_repair_val(sk, &val);
+ release_sock(sk);
+
+ if (err)
+ return err;
+ len = min_t(unsigned int, len, sizeof(val));
+ if (put_user(len, optlen))
+ return -EFAULT;
+ if (copy_to_user(optval, &val, len))
+ return -EFAULT;
+ return 0;
+ }
#endif
default:
return -ENOPROTOOPT;
}
@@ -682,10 +682,63 @@ int tcp_get_authopt_val(struct sock *sk, struct tcp_authopt *opt)
opt->recv_rnextkeyid = info->recv_rnextkeyid;
return 0;
}
+int tcp_get_authopt_repair_val(struct sock *sk, struct tcp_authopt_repair *opt)
+{
+ struct tcp_sock *tp = tcp_sk(sk);
+ struct tcp_authopt_info *info;
+ int err;
+
+ memset(opt, 0, sizeof(*opt));
+ sock_owned_by_me(sk);
+ err = check_sysctl_tcp_authopt();
+ if (err)
+ return err;
+
+ info = rcu_dereference_check(tp->authopt_info, lockdep_sock_is_held(sk));
+ if (!info)
+ return -ENOENT;
+
+ opt->dst_isn = info->dst_isn;
+ opt->src_isn = info->src_isn;
+ opt->rcv_sne = info->rcv_sne;
+ opt->snd_sne = info->snd_sne;
+
+ return 0;
+}
+
+int tcp_set_authopt_repair(struct sock *sk, sockptr_t optval, unsigned int optlen)
+{
+ struct tcp_sock *tp = tcp_sk(sk);
+ struct tcp_authopt_info *info;
+ struct tcp_authopt_repair val;
+ int err;
+
+ sock_owned_by_me(sk);
+ err = check_sysctl_tcp_authopt();
+ if (err)
+ return err;
+
+ if (optlen != sizeof(val))
+ return -EFAULT;
+ if (copy_from_sockptr(&val, optval, sizeof(val)))
+ return -EFAULT;
+
+ info = rcu_dereference_check(tp->authopt_info, lockdep_sock_is_held(sk));
+ if (!info)
+ return -ENOENT;
+
+ info->dst_isn = val.dst_isn;
+ info->src_isn = val.src_isn;
+ info->rcv_sne = val.rcv_sne;
+ info->snd_sne = val.snd_sne;
+
+ return 0;
+}
+
#define TCP_AUTHOPT_KEY_KNOWN_FLAGS ( \
TCP_AUTHOPT_KEY_DEL | \
TCP_AUTHOPT_KEY_EXCLUDE_OPTS | \
TCP_AUTHOPT_KEY_ADDR_BIND | \
TCP_AUTHOPT_KEY_IFINDEX | \
In order to support TCP_REPAIR for connections use RFC5925 Authentication Option add a sockopt to get/set ISN and SNE values. Signed-off-by: Leonard Crestez <cdleonard@gmail.com> --- include/net/tcp_authopt.h | 2 ++ include/uapi/linux/tcp.h | 15 +++++++++++ net/ipv4/tcp.c | 23 +++++++++++++++++ net/ipv4/tcp_authopt.c | 53 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 93 insertions(+)