Revert "DO-NOT-MERGE: mptcp: use kmalloc on kasan build"

This reverts commit 4edee9a.

This piece of code was causing issues, see:

  #371 (comment)

It sounds safer to revert it then.

Suggested-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>

net/ipv4/af_inet.c

@@ -312,10 +312,7 @@ static int inet_create(struct net *net, struct socket *sock, int protocol,
 	answer_flags = answer->flags;
 	rcu_read_unlock();
 
-#if !IS_ENABLED(CONFIG_KASAN)
-	/* with kasan we use kmalloc */
 	WARN_ON(!answer_prot->slab);
-#endif
 
 	err = -ENOMEM;
 	sk = sk_alloc(net, PF_INET, GFP_KERNEL, answer_prot, kern);

net/ipv6/af_inet6.c

@@ -186,10 +186,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol,
 	answer_flags = answer->flags;
 	rcu_read_unlock();
 
-#if !IS_ENABLED(CONFIG_KASAN)
-	/* with kasan we use kmalloc */
 	WARN_ON(!answer_prot->slab);
-#endif
 
 	err = -ENOBUFS;
 	sk = sk_alloc(net, PF_INET6, GFP_KERNEL, answer_prot, kern);

net/mptcp/protocol.c

@@ -2763,10 +2763,6 @@ static int __mptcp_init_sock(struct sock *sk)
 	timer_setup(&msk->sk.icsk_retransmit_timer, mptcp_retransmit_timer, 0);
 	timer_setup(&sk->sk_timer, mptcp_timeout_timer, 0);
 
-#if IS_ENABLED(CONFIG_KASAN)
-	sock_set_flag(sk, SOCK_RCU_FREE);
-#endif
-
 	return 0;
 }
 
@@ -3190,9 +3186,7 @@ struct sock *mptcp_sk_clone(const struct sock *sk,
 	msk->setsockopt_seq = mptcp_sk(sk)->setsockopt_seq;
 	mptcp_init_sched(msk, mptcp_sk(sk)->sched);
 
-#if !IS_ENABLED(CONFIG_KASAN)
 	sock_reset_flag(nsk, SOCK_RCU_FREE);
-#endif
 	/* will be fully established after successful MPC subflow creation */
 	inet_sk_state_store(nsk, TCP_SYN_RECV);
 
@@ -3961,12 +3955,6 @@ static int mptcp_napi_poll(struct napi_struct *napi, int budget)
 	return work_done;
 }
 
-#if IS_ENABLED(CONFIG_KASAN)
-#define MPTCP_USE_SLAB		0
-#else
-#define MPTCP_USE_SLAB		1
-#endif
-
 void __init mptcp_proto_init(void)
 {
 	struct mptcp_delegated_action *delegated;
@@ -3990,7 +3978,7 @@ void __init mptcp_proto_init(void)
 	mptcp_pm_init();
 	mptcp_token_init();
 
-	if (proto_register(&mptcp_prot, MPTCP_USE_SLAB) != 0)
+	if (proto_register(&mptcp_prot, 1) != 0)
 		panic("Failed to register MPTCP proto.\n");
 
 	inet_register_protosw(&mptcp_protosw);
@@ -4043,7 +4031,7 @@ int __init mptcp_proto_v6_init(void)
 	mptcp_v6_prot.slab = NULL;
 	mptcp_v6_prot.obj_size = sizeof(struct mptcp6_sock);
 
-	err = proto_register(&mptcp_v6_prot, MPTCP_USE_SLAB);
+	err = proto_register(&mptcp_v6_prot, 1);
 	if (err)
 		return err;