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

Merge branch 'sctp-add-support-for-some-sctp-auth-APIs-from-RFC6458' 



Xin Long says:

====================
sctp: add support for some sctp auth APIs from RFC6458

This patchset mainly adds support for SCTP AUTH Information for sendmsg,
described in RFC6458:

    5.3.8.  SCTP AUTH Information Structure (SCTP_AUTHINFO)

and also adds a sockopt described in RFC6458:

    8.3.4.  Deactivate a Shared Key (SCTP_AUTH_DEACTIVATE_KEY)

and two types of events for AUTHENTICATION_EVENT described in RFC6458:

    6.1.8.  SCTP_AUTHENTICATION_EVENT:
             - SCTP_AUTH_NO_AUTH
             - SCTP_AUTH_FREE_KEY

After this patchset, we have fully support for sctp_sendv in kernel.

Note that this patchset won't touch that sctp options merge conflict.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c4690127 30f6ebf6

include/net/sctp/auth.h

+12 −9
Original line number Diff line number Diff line
@@ -62,8 +62,10 @@ struct sctp_auth_bytes { 
/* Definition for a shared key, weather endpoint or association */

struct sctp_shared_key {

	struct list_head key_list;

	__u16 key_id;

	struct sctp_auth_bytes *key;

	refcount_t refcnt;

	__u16 key_id;

	__u8 deactivated;

};



#define key_for_each(__key, __list_head) \
@@ -103,21 +105,22 @@ int sctp_auth_send_cid(enum sctp_cid chunk, 
int sctp_auth_recv_cid(enum sctp_cid chunk,

		       const struct sctp_association *asoc);

void sctp_auth_calculate_hmac(const struct sctp_association *asoc,

			    struct sk_buff *skb,

			    struct sctp_auth_chunk *auth, gfp_t gfp);

			      struct sk_buff *skb, struct sctp_auth_chunk *auth,

			      struct sctp_shared_key *ep_key, gfp_t gfp);

void sctp_auth_shkey_release(struct sctp_shared_key *sh_key);

void sctp_auth_shkey_hold(struct sctp_shared_key *sh_key);



/* API Helpers */

int sctp_auth_ep_add_chunkid(struct sctp_endpoint *ep, __u8 chunk_id);

int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep,

			    struct sctp_hmacalgo *hmacs);

int sctp_auth_set_key(struct sctp_endpoint *ep,

		      struct sctp_association *asoc,

int sctp_auth_set_key(struct sctp_endpoint *ep, struct sctp_association *asoc,

		      struct sctp_authkey *auth_key);

int sctp_auth_set_active_key(struct sctp_endpoint *ep,

		      struct sctp_association *asoc,

		      __u16 key_id);

			     struct sctp_association *asoc, __u16 key_id);

int sctp_auth_del_key_id(struct sctp_endpoint *ep,

		      struct sctp_association *asoc,

		      __u16 key_id);

			 struct sctp_association *asoc, __u16 key_id);

int sctp_auth_deact_key_id(struct sctp_endpoint *ep,

			   struct sctp_association *asoc, __u16 key_id);



#endif

include/net/sctp/command.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ enum sctp_verb { 
	SCTP_CMD_SET_SK_ERR,	 /* Set sk_err */

	SCTP_CMD_ASSOC_CHANGE,	 /* generate and send assoc_change event */

	SCTP_CMD_ADAPTATION_IND, /* generate and send adaptation event */

	SCTP_CMD_PEER_NO_AUTH,   /* generate and send authentication event */

	SCTP_CMD_ASSOC_SHKEY,    /* generate the association shared keys */

	SCTP_CMD_T1_RETRAN,	 /* Mark for retransmission after T1 timeout  */

	SCTP_CMD_UPDATE_INITTAG, /* Update peer inittag */

include/net/sctp/sm.h

+2 −1
Original line number Diff line number Diff line
@@ -263,7 +263,8 @@ int sctp_process_asconf_ack(struct sctp_association *asoc, 
struct sctp_chunk *sctp_make_fwdtsn(const struct sctp_association *asoc,

				    __u32 new_cum_tsn, size_t nstreams,

				    struct sctp_fwdtsn_skip *skiplist);

struct sctp_chunk *sctp_make_auth(const struct sctp_association *asoc);

struct sctp_chunk *sctp_make_auth(const struct sctp_association *asoc,

				  __u16 key_id);

struct sctp_chunk *sctp_make_strreset_req(const struct sctp_association *asoc,

					  __u16 stream_num, __be16 *stream_list,

					  bool out, bool in);

include/net/sctp/structs.h

+8 −2
Original line number Diff line number Diff line
@@ -577,8 +577,12 @@ struct sctp_chunk { 
	/* This points to the sk_buff containing the actual data.  */

	struct sk_buff *skb;



	union {

		/* In case of GSO packets, this will store the head one */

		struct sk_buff *head_skb;

		/* In case of auth enabled, this will point to the shkey */

		struct sctp_shared_key *shkey;

	};



	/* These are the SCTP headers by reverse order in a packet.

	 * Note that some of these may happen more than once.  In that
@@ -1995,6 +1999,7 @@ struct sctp_association { 
	 * The current generated assocaition shared key (secret)

	 */

	struct sctp_auth_bytes *asoc_shared_key;

	struct sctp_shared_key *shkey;



	/* SCTP AUTH: hmac id of the first peer requested algorithm

	 * that we support.
@@ -2113,6 +2118,7 @@ struct sctp_cmsgs { 
	struct sctp_sndrcvinfo *srinfo;

	struct sctp_sndinfo *sinfo;

	struct sctp_prinfo *prinfo;

	struct sctp_authinfo *authinfo;

	struct msghdr *addrs_msg;

};

include/uapi/linux/sctp.h

+20 −2
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ typedef __s32 sctp_assoc_t; 
#define SCTP_RECVRCVINFO	32

#define SCTP_RECVNXTINFO	33

#define SCTP_DEFAULT_SNDINFO	34

#define SCTP_AUTH_DEACTIVATE_KEY	35



/* Internal Socket Options. Some of the sctp library functions are

 * implemented using these socket options.
@@ -273,6 +274,18 @@ struct sctp_prinfo { 
	__u32 pr_value;

};



/* 5.3.8 SCTP AUTH Information Structure (SCTP_AUTHINFO)

 *

 *   This cmsghdr structure specifies SCTP options for sendmsg().

 *

 *   cmsg_level    cmsg_type      cmsg_data[]

 *   ------------  ------------   -------------------

 *   IPPROTO_SCTP  SCTP_AUTHINFO  struct sctp_authinfo

 */

struct sctp_authinfo {

	__u16 auth_keynumber;

};



/*

 *  sinfo_flags: 16 bits (unsigned integer)

 *
@@ -310,7 +323,7 @@ typedef enum sctp_cmsg_type { 
#define SCTP_NXTINFO	SCTP_NXTINFO

	SCTP_PRINFO,		/* 5.3.7 SCTP PR-SCTP Information Structure */

#define SCTP_PRINFO	SCTP_PRINFO

	SCTP_AUTHINFO,		/* 5.3.8 SCTP AUTH Information Structure (RESERVED) */

	SCTP_AUTHINFO,		/* 5.3.8 SCTP AUTH Information Structure */

#define SCTP_AUTHINFO	SCTP_AUTHINFO

	SCTP_DSTADDRV4,		/* 5.3.9 SCTP Destination IPv4 Address Structure */

#define SCTP_DSTADDRV4	SCTP_DSTADDRV4
@@ -505,7 +518,12 @@ struct sctp_authkey_event { 
	sctp_assoc_t auth_assoc_id;

};



enum { SCTP_AUTH_NEWKEY = 0, };

enum {

	SCTP_AUTH_NEW_KEY,

#define	SCTP_AUTH_NEWKEY	SCTP_AUTH_NEW_KEY /* compatible with before */

	SCTP_AUTH_FREE_KEY,

	SCTP_AUTH_NO_AUTH,

};



/*

 * 6.1.9. SCTP_SENDER_DRY_EVENT

CRA Git | Maintained and supported by SUSTech CRA and CCSE