Commit eff8313b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'tcp-ao' 



Dmitry Safonov says:

====================
net/tcp: Add TCP-AO support

This is version 16 of TCP-AO support. It addresses the build warning
in the middle of patch set, reported by kernel test robot.

There's one Sparse warning introduced by tcp_sigpool_start():
__cond_acquires() seems to currently being broken. I've described
the reasoning for it on v9 cover letter. Also, checkpatch.pl warnings
were addressed, but yet I've left the ones that are more personal
preferences (i.e. 80 columns limit). Please, ping me if you have
a strong feeling about one of them.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cc54d2e2 7fe0e38b

Documentation/networking/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ Contents: 
   sysfs-tagging

   tc-actions-env-rules

   tc-queue-filters

   tcp_ao

   tcp-thin

   team

   timestamping

Documentation/networking/tcp_ao.rst

0 → 100644
+444 −0

File added.

Preview size limit exceeded, changes collapsed.

include/linux/sockptr.h

+23 −0
Original line number Diff line number Diff line
@@ -55,6 +55,29 @@ static inline int copy_from_sockptr(void *dst, sockptr_t src, size_t size) 
	return copy_from_sockptr_offset(dst, src, 0, size);

}



static inline int copy_struct_from_sockptr(void *dst, size_t ksize,

		sockptr_t src, size_t usize)

{

	size_t size = min(ksize, usize);

	size_t rest = max(ksize, usize) - size;



	if (!sockptr_is_kernel(src))

		return copy_struct_from_user(dst, ksize, src.user, size);



	if (usize < ksize) {

		memset(dst + size, 0, rest);

	} else if (usize > ksize) {

		char *p = src.kernel;



		while (rest--) {

			if (*p++)

				return -E2BIG;

		}

	}

	memcpy(dst, src.kernel, size);

	return 0;

}



static inline int copy_to_sockptr_offset(sockptr_t dst, size_t offset,

		const void *src, size_t size)

{

include/linux/tcp.h

+28 −2
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ struct tcp_request_sock { 
						  * after data-in-SYN.

						  */

	u8				syn_tos;

#ifdef CONFIG_TCP_AO

	u8				ao_keyid;

	u8				ao_rcv_next;

	u8				maclen;

#endif

};



static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req)
@@ -173,6 +178,19 @@ static inline struct tcp_request_sock *tcp_rsk(const struct request_sock *req) 
	return (struct tcp_request_sock *)req;

}



static inline bool tcp_rsk_used_ao(const struct request_sock *req)

{

	/* The real length of MAC is saved in the request socket,

	 * signing anything with zero-length makes no sense, so here is

	 * a little hack..

	 */

#ifndef CONFIG_TCP_AO

	return false;

#else

	return tcp_rsk(req)->maclen != 0;

#endif

}



#define TCP_RMEM_TO_WIN_SCALE 8



struct tcp_sock {
@@ -447,13 +465,18 @@ struct tcp_sock { 
	bool	syn_smc;	/* SYN includes SMC */

#endif



#ifdef CONFIG_TCP_MD5SIG

/* TCP AF-Specific parts; only used by MD5 Signature support so far */

#if defined(CONFIG_TCP_MD5SIG) || defined(CONFIG_TCP_AO)

/* TCP AF-Specific parts; only used by TCP-AO/MD5 Signature support so far */

	const struct tcp_sock_af_ops	*af_specific;



#ifdef CONFIG_TCP_MD5SIG

/* TCP MD5 Signature Option information */

	struct tcp_md5sig_info	__rcu *md5sig_info;

#endif

#ifdef CONFIG_TCP_AO

	struct tcp_ao_info	__rcu *ao_info;

#endif

#endif



/* TCP fastopen related information */

	struct tcp_fastopen_request *fastopen_req;
@@ -509,6 +532,9 @@ struct tcp_timewait_sock { 
#ifdef CONFIG_TCP_MD5SIG

	struct tcp_md5sig_key	  *tw_md5_key;

#endif

#ifdef CONFIG_TCP_AO

	struct tcp_ao_info	__rcu *ao_info;

#endif

};



static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)

include/net/dropreason-core.h

+30 −0

File changed.

Preview size limit exceeded, changes collapsed.