[PATCH 1/2] net: tls: add compat for get/setsockopt

[Rouven Czerwinski]

If compat_{s,g}etsockopt for TLS are not implemented, the TLS layer will
never be called on a system where CONFIG_COMPAT is enabled and userspace
is 32bit. Implement both to support CONFIG_COMPAT.

Signed-off-by: Rouven Czerwinski <r.czerwin...@pengutronix.de>
---
 net/tls/tls_main.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index ec10041c6b7d..92c5893fe692 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -450,6 +450,18 @@ static int tls_getsockopt(struct sock *sk, int level, int 
optname,
        return do_tls_getsockopt(sk, optname, optval, optlen);
 }
 
+static int tls_compat_getsockopt(struct sock *sk, int level, int optname,
+                                char __user *optval, int __user *optlen)
+{
+       struct tls_context *ctx = tls_get_ctx(sk);
+
+       if (level != SOL_TLS)
+               return ctx->sk_proto->compat_getsockopt(sk, level, optname,
+                                                       optval, optlen);
+
+       return do_tls_getsockopt(sk, optname, optval, optlen);
+}
+
 static int do_tls_setsockopt_conf(struct sock *sk, char __user *optval,
                                  unsigned int optlen, int tx)
 {
@@ -611,6 +623,18 @@ static int tls_setsockopt(struct sock *sk, int level, int 
optname,
        return do_tls_setsockopt(sk, optname, optval, optlen);
 }
 
+static int tls_compat_setsockopt(struct sock *sk, int level, int optname,
+                                char __user *optval, unsigned int optlen)
+{
+       struct tls_context *ctx = tls_get_ctx(sk);
+
+       if (level != SOL_TLS)
+               return ctx->sk_proto->compat_setsockopt(sk, level, optname,
+                                                       optval, optlen);
+
+       return do_tls_setsockopt(sk, optname, optval, optlen);
+}
+
 struct tls_context *tls_ctx_create(struct sock *sk)
 {
        struct inet_connection_sock *icsk = inet_csk(sk);
@@ -660,6 +684,10 @@ static void build_protos(struct proto 
prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG],
        prot[TLS_BASE][TLS_BASE].setsockopt     = tls_setsockopt;
        prot[TLS_BASE][TLS_BASE].getsockopt     = tls_getsockopt;
        prot[TLS_BASE][TLS_BASE].close          = tls_sk_proto_close;
+#ifdef CONFIG_COMPAT
+       prot[TLS_BASE][TLS_BASE].compat_setsockopt      = tls_compat_setsockopt;
+       prot[TLS_BASE][TLS_BASE].compat_getsockopt      = tls_compat_getsockopt;
+#endif
 
        prot[TLS_SW][TLS_BASE] = prot[TLS_BASE][TLS_BASE];
        prot[TLS_SW][TLS_BASE].sendmsg          = tls_sw_sendmsg;
-- 
2.27.0