Commit cfc6731d authored by David S. Miller's avatar David S. Miller

Merge branch 'sctp-add-subscribe-per-asoc-and-sockopt-SCTP_EVENT'

Xin Long says:

====================
sctp: add subscribe per asoc and sockopt SCTP_EVENT

This patchset mainly adds the Event Subscription sockopt described in
rfc6525#section-6.2:

"Subscribing to events as described in [RFC6458] uses a setsockopt()
call with the SCTP_EVENT socket option.  This option takes the
following structure, which specifies the association, the event type
(using the same value found in the event type field), and an on/off
boolean.

  struct sctp_event {
    sctp_assoc_t se_assoc_id;
    uint16_t     se_type;
    uint8_t      se_on;
  };

The user fills in the se_type field with the same value found in the
strreset_type field, i.e., SCTP_STREAM_RESET_EVENT.  The user will
also fill in the se_assoc_id field with either the association to set
this event on (this field is ignored for one-to-one style sockets) or
one of the reserved constant values defined in [RFC6458].  Finally,
the se_on field is set with a 1 to enable the event or a 0 to disable
the event."

As for the old SCTP_EVENTS Option with struct sctp_event_subscribe,
it's being DEPRECATED.

v1->v2:
  - fix some key word in changelog that triggerred the filters at
    vger.kernel.org.
v2->v3:
  - fix an array out of bounds noticed by Neil in patch 1/4.
====================
Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents f2be6d71 480ba9c1
...@@ -71,7 +71,7 @@ enum { SCTP_DEFAULT_INSTREAMS = SCTP_MAX_STREAM }; ...@@ -71,7 +71,7 @@ enum { SCTP_DEFAULT_INSTREAMS = SCTP_MAX_STREAM };
SCTP_NUM_AUTH_CHUNK_TYPES) SCTP_NUM_AUTH_CHUNK_TYPES)
/* These are the different flavours of event. */ /* These are the different flavours of event. */
enum sctp_event { enum sctp_event_type {
SCTP_EVENT_T_CHUNK = 1, SCTP_EVENT_T_CHUNK = 1,
SCTP_EVENT_T_TIMEOUT, SCTP_EVENT_T_TIMEOUT,
SCTP_EVENT_T_OTHER, SCTP_EVENT_T_OTHER,
......
...@@ -173,7 +173,7 @@ sctp_state_fn_t sctp_sf_autoclose_timer_expire; ...@@ -173,7 +173,7 @@ sctp_state_fn_t sctp_sf_autoclose_timer_expire;
__u8 sctp_get_chunk_type(struct sctp_chunk *chunk); __u8 sctp_get_chunk_type(struct sctp_chunk *chunk);
const struct sctp_sm_table_entry *sctp_sm_lookup_event( const struct sctp_sm_table_entry *sctp_sm_lookup_event(
struct net *net, struct net *net,
enum sctp_event event_type, enum sctp_event_type event_type,
enum sctp_state state, enum sctp_state state,
union sctp_subtype event_subtype); union sctp_subtype event_subtype);
int sctp_chunk_iif(const struct sctp_chunk *); int sctp_chunk_iif(const struct sctp_chunk *);
...@@ -313,7 +313,7 @@ struct sctp_chunk *sctp_process_strreset_resp( ...@@ -313,7 +313,7 @@ struct sctp_chunk *sctp_process_strreset_resp(
/* Prototypes for statetable processing. */ /* Prototypes for statetable processing. */
int sctp_do_sm(struct net *net, enum sctp_event event_type, int sctp_do_sm(struct net *net, enum sctp_event_type event_type,
union sctp_subtype subtype, enum sctp_state state, union sctp_subtype subtype, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_association *asoc, struct sctp_endpoint *ep, struct sctp_association *asoc,
void *event_arg, gfp_t gfp); void *event_arg, gfp_t gfp);
......
...@@ -217,7 +217,7 @@ struct sctp_sock { ...@@ -217,7 +217,7 @@ struct sctp_sock {
* These two structures must be grouped together for the usercopy * These two structures must be grouped together for the usercopy
* whitelist region. * whitelist region.
*/ */
struct sctp_event_subscribe subscribe; __u16 subscribe;
struct sctp_initmsg initmsg; struct sctp_initmsg initmsg;
int user_frag; int user_frag;
...@@ -2077,6 +2077,8 @@ struct sctp_association { ...@@ -2077,6 +2077,8 @@ struct sctp_association {
int sent_cnt_removable; int sent_cnt_removable;
__u16 subscribe;
__u64 abandoned_unsent[SCTP_PR_INDEX(MAX) + 1]; __u64 abandoned_unsent[SCTP_PR_INDEX(MAX) + 1];
__u64 abandoned_sent[SCTP_PR_INDEX(MAX) + 1]; __u64 abandoned_sent[SCTP_PR_INDEX(MAX) + 1];
}; };
......
...@@ -164,30 +164,39 @@ void sctp_ulpevent_read_nxtinfo(const struct sctp_ulpevent *event, ...@@ -164,30 +164,39 @@ void sctp_ulpevent_read_nxtinfo(const struct sctp_ulpevent *event,
__u16 sctp_ulpevent_get_notification_type(const struct sctp_ulpevent *event); __u16 sctp_ulpevent_get_notification_type(const struct sctp_ulpevent *event);
static inline void sctp_ulpevent_type_set(__u16 *subscribe,
__u16 sn_type, __u8 on)
{
if (sn_type > SCTP_SN_TYPE_MAX)
return;
if (on)
*subscribe |= (1 << (sn_type - SCTP_SN_TYPE_BASE));
else
*subscribe &= ~(1 << (sn_type - SCTP_SN_TYPE_BASE));
}
/* Is this event type enabled? */ /* Is this event type enabled? */
static inline int sctp_ulpevent_type_enabled(__u16 sn_type, static inline bool sctp_ulpevent_type_enabled(__u16 subscribe, __u16 sn_type)
struct sctp_event_subscribe *mask)
{ {
int offset = sn_type - SCTP_SN_TYPE_BASE; if (sn_type > SCTP_SN_TYPE_MAX)
char *amask = (char *) mask; return false;
if (offset >= sizeof(struct sctp_event_subscribe)) return subscribe & (1 << (sn_type - SCTP_SN_TYPE_BASE));
return 0;
return amask[offset];
} }
/* Given an event subscription, is this event enabled? */ /* Given an event subscription, is this event enabled? */
static inline int sctp_ulpevent_is_enabled(const struct sctp_ulpevent *event, static inline bool sctp_ulpevent_is_enabled(const struct sctp_ulpevent *event,
struct sctp_event_subscribe *mask) __u16 subscribe)
{ {
__u16 sn_type; __u16 sn_type;
int enabled = 1;
if (sctp_ulpevent_is_notification(event)) { if (!sctp_ulpevent_is_notification(event))
sn_type = sctp_ulpevent_get_notification_type(event); return true;
enabled = sctp_ulpevent_type_enabled(sn_type, mask);
} sn_type = sctp_ulpevent_get_notification_type(event);
return enabled;
return sctp_ulpevent_type_enabled(subscribe, sn_type);
} }
#endif /* __sctp_ulpevent_h__ */ #endif /* __sctp_ulpevent_h__ */
...@@ -129,6 +129,7 @@ typedef __s32 sctp_assoc_t; ...@@ -129,6 +129,7 @@ typedef __s32 sctp_assoc_t;
#define SCTP_STREAM_SCHEDULER_VALUE 124 #define SCTP_STREAM_SCHEDULER_VALUE 124
#define SCTP_INTERLEAVING_SUPPORTED 125 #define SCTP_INTERLEAVING_SUPPORTED 125
#define SCTP_SENDMSG_CONNECT 126 #define SCTP_SENDMSG_CONNECT 126
#define SCTP_EVENT 127
/* PR-SCTP policies */ /* PR-SCTP policies */
#define SCTP_PR_SCTP_NONE 0x0000 #define SCTP_PR_SCTP_NONE 0x0000
...@@ -632,7 +633,9 @@ union sctp_notification { ...@@ -632,7 +633,9 @@ union sctp_notification {
*/ */
enum sctp_sn_type { enum sctp_sn_type {
SCTP_SN_TYPE_BASE = (1<<15), SCTP_SN_TYPE_BASE = (1<<15),
SCTP_DATA_IO_EVENT = SCTP_SN_TYPE_BASE,
#define SCTP_DATA_IO_EVENT SCTP_DATA_IO_EVENT
SCTP_ASSOC_CHANGE, SCTP_ASSOC_CHANGE,
#define SCTP_ASSOC_CHANGE SCTP_ASSOC_CHANGE #define SCTP_ASSOC_CHANGE SCTP_ASSOC_CHANGE
SCTP_PEER_ADDR_CHANGE, SCTP_PEER_ADDR_CHANGE,
...@@ -657,6 +660,8 @@ enum sctp_sn_type { ...@@ -657,6 +660,8 @@ enum sctp_sn_type {
#define SCTP_ASSOC_RESET_EVENT SCTP_ASSOC_RESET_EVENT #define SCTP_ASSOC_RESET_EVENT SCTP_ASSOC_RESET_EVENT
SCTP_STREAM_CHANGE_EVENT, SCTP_STREAM_CHANGE_EVENT,
#define SCTP_STREAM_CHANGE_EVENT SCTP_STREAM_CHANGE_EVENT #define SCTP_STREAM_CHANGE_EVENT SCTP_STREAM_CHANGE_EVENT
SCTP_SN_TYPE_MAX = SCTP_STREAM_CHANGE_EVENT,
#define SCTP_SN_TYPE_MAX SCTP_SN_TYPE_MAX
}; };
/* Notification error codes used to fill up the error fields in some /* Notification error codes used to fill up the error fields in some
...@@ -1150,6 +1155,12 @@ struct sctp_add_streams { ...@@ -1150,6 +1155,12 @@ struct sctp_add_streams {
uint16_t sas_outstrms; uint16_t sas_outstrms;
}; };
struct sctp_event {
sctp_assoc_t se_assoc_id;
uint16_t se_type;
uint8_t se_on;
};
/* SCTP Stream schedulers */ /* SCTP Stream schedulers */
enum sctp_sched_type { enum sctp_sched_type {
SCTP_SS_FCFS, SCTP_SS_FCFS,
......
...@@ -135,6 +135,8 @@ static struct sctp_association *sctp_association_init( ...@@ -135,6 +135,8 @@ static struct sctp_association *sctp_association_init(
*/ */
asoc->max_burst = sp->max_burst; asoc->max_burst = sp->max_burst;
asoc->subscribe = sp->subscribe;
/* initialize association timers */ /* initialize association timers */
asoc->timeouts[SCTP_EVENT_TIMEOUT_T1_COOKIE] = asoc->rto_initial; asoc->timeouts[SCTP_EVENT_TIMEOUT_T1_COOKIE] = asoc->rto_initial;
asoc->timeouts[SCTP_EVENT_TIMEOUT_T1_INIT] = asoc->rto_initial; asoc->timeouts[SCTP_EVENT_TIMEOUT_T1_INIT] = asoc->rto_initial;
......
...@@ -86,11 +86,10 @@ void sctp_datamsg_free(struct sctp_datamsg *msg) ...@@ -86,11 +86,10 @@ void sctp_datamsg_free(struct sctp_datamsg *msg)
/* Final destructruction of datamsg memory. */ /* Final destructruction of datamsg memory. */
static void sctp_datamsg_destroy(struct sctp_datamsg *msg) static void sctp_datamsg_destroy(struct sctp_datamsg *msg)
{ {
struct sctp_association *asoc = NULL;
struct list_head *pos, *temp; struct list_head *pos, *temp;
struct sctp_chunk *chunk; struct sctp_chunk *chunk;
struct sctp_sock *sp;
struct sctp_ulpevent *ev; struct sctp_ulpevent *ev;
struct sctp_association *asoc = NULL;
int error = 0, notify; int error = 0, notify;
/* If we failed, we may need to notify. */ /* If we failed, we may need to notify. */
...@@ -108,9 +107,8 @@ static void sctp_datamsg_destroy(struct sctp_datamsg *msg) ...@@ -108,9 +107,8 @@ static void sctp_datamsg_destroy(struct sctp_datamsg *msg)
else else
error = asoc->outqueue.error; error = asoc->outqueue.error;
sp = sctp_sk(asoc->base.sk); notify = sctp_ulpevent_type_enabled(asoc->subscribe,
notify = sctp_ulpevent_type_enabled(SCTP_SEND_FAILED, SCTP_SEND_FAILED);
&sp->subscribe);
} }
/* Generate a SEND FAILED event only if enabled. */ /* Generate a SEND FAILED event only if enabled. */
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
int sctp_primitive_ ## name(struct net *net, struct sctp_association *asoc, \ int sctp_primitive_ ## name(struct net *net, struct sctp_association *asoc, \
void *arg) { \ void *arg) { \
int error = 0; \ int error = 0; \
enum sctp_event event_type; union sctp_subtype subtype; \ enum sctp_event_type event_type; union sctp_subtype subtype; \
enum sctp_state state; \ enum sctp_state state; \
struct sctp_endpoint *ep; \ struct sctp_endpoint *ep; \
\ \
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include <net/sctp/sm.h> #include <net/sctp/sm.h>
#include <net/sctp/stream_sched.h> #include <net/sctp/stream_sched.h>
static int sctp_cmd_interpreter(enum sctp_event event_type, static int sctp_cmd_interpreter(enum sctp_event_type event_type,
union sctp_subtype subtype, union sctp_subtype subtype,
enum sctp_state state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
...@@ -61,7 +61,7 @@ static int sctp_cmd_interpreter(enum sctp_event event_type, ...@@ -61,7 +61,7 @@ static int sctp_cmd_interpreter(enum sctp_event event_type,
enum sctp_disposition status, enum sctp_disposition status,
struct sctp_cmd_seq *commands, struct sctp_cmd_seq *commands,
gfp_t gfp); gfp_t gfp);
static int sctp_side_effects(enum sctp_event event_type, static int sctp_side_effects(enum sctp_event_type event_type,
union sctp_subtype subtype, union sctp_subtype subtype,
enum sctp_state state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
...@@ -623,7 +623,7 @@ static void sctp_cmd_init_failed(struct sctp_cmd_seq *commands, ...@@ -623,7 +623,7 @@ static void sctp_cmd_init_failed(struct sctp_cmd_seq *commands,
/* Worker routine to handle SCTP_CMD_ASSOC_FAILED. */ /* Worker routine to handle SCTP_CMD_ASSOC_FAILED. */
static void sctp_cmd_assoc_failed(struct sctp_cmd_seq *commands, static void sctp_cmd_assoc_failed(struct sctp_cmd_seq *commands,
struct sctp_association *asoc, struct sctp_association *asoc,
enum sctp_event event_type, enum sctp_event_type event_type,
union sctp_subtype subtype, union sctp_subtype subtype,
struct sctp_chunk *chunk, struct sctp_chunk *chunk,
unsigned int error) unsigned int error)
...@@ -1162,7 +1162,7 @@ static void sctp_cmd_send_asconf(struct sctp_association *asoc) ...@@ -1162,7 +1162,7 @@ static void sctp_cmd_send_asconf(struct sctp_association *asoc)
* If you want to understand all of lksctp, this is a * If you want to understand all of lksctp, this is a
* good place to start. * good place to start.
*/ */
int sctp_do_sm(struct net *net, enum sctp_event event_type, int sctp_do_sm(struct net *net, enum sctp_event_type event_type,
union sctp_subtype subtype, enum sctp_state state, union sctp_subtype subtype, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_association *asoc, struct sctp_endpoint *ep, struct sctp_association *asoc,
void *event_arg, gfp_t gfp) void *event_arg, gfp_t gfp)
...@@ -1199,7 +1199,7 @@ int sctp_do_sm(struct net *net, enum sctp_event event_type, ...@@ -1199,7 +1199,7 @@ int sctp_do_sm(struct net *net, enum sctp_event event_type,
/***************************************************************** /*****************************************************************
* This the master state function side effect processing function. * This the master state function side effect processing function.
*****************************************************************/ *****************************************************************/
static int sctp_side_effects(enum sctp_event event_type, static int sctp_side_effects(enum sctp_event_type event_type,
union sctp_subtype subtype, union sctp_subtype subtype,
enum sctp_state state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
...@@ -1285,7 +1285,7 @@ static int sctp_side_effects(enum sctp_event event_type, ...@@ -1285,7 +1285,7 @@ static int sctp_side_effects(enum sctp_event event_type,
********************************************************************/ ********************************************************************/
/* This is the side-effect interpreter. */ /* This is the side-effect interpreter. */
static int sctp_cmd_interpreter(enum sctp_event event_type, static int sctp_cmd_interpreter(enum sctp_event_type event_type,
union sctp_subtype subtype, union sctp_subtype subtype,
enum sctp_state state, enum sctp_state state,
struct sctp_endpoint *ep, struct sctp_endpoint *ep,
......
...@@ -79,7 +79,7 @@ static const struct sctp_sm_table_entry bug = { ...@@ -79,7 +79,7 @@ static const struct sctp_sm_table_entry bug = {
const struct sctp_sm_table_entry *sctp_sm_lookup_event( const struct sctp_sm_table_entry *sctp_sm_lookup_event(
struct net *net, struct net *net,
enum sctp_event event_type, enum sctp_event_type event_type,
enum sctp_state state, enum sctp_state state,
union sctp_subtype event_subtype) union sctp_subtype event_subtype)
{ {
......
...@@ -2230,7 +2230,7 @@ static int sctp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, ...@@ -2230,7 +2230,7 @@ static int sctp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
if (sp->recvrcvinfo) if (sp->recvrcvinfo)
sctp_ulpevent_read_rcvinfo(event, msg); sctp_ulpevent_read_rcvinfo(event, msg);
/* Check if we allow SCTP_SNDRCVINFO. */ /* Check if we allow SCTP_SNDRCVINFO. */
if (sp->subscribe.sctp_data_io_event) if (sctp_ulpevent_type_enabled(sp->subscribe, SCTP_DATA_IO_EVENT))
sctp_ulpevent_read_sndrcvinfo(event, msg); sctp_ulpevent_read_sndrcvinfo(event, msg);
err = copied; err = copied;
...@@ -2304,22 +2304,33 @@ static int sctp_setsockopt_disable_fragments(struct sock *sk, ...@@ -2304,22 +2304,33 @@ static int sctp_setsockopt_disable_fragments(struct sock *sk,
static int sctp_setsockopt_events(struct sock *sk, char __user *optval, static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_event_subscribe subscribe;
__u8 *sn_type = (__u8 *)&subscribe;
struct sctp_sock *sp = sctp_sk(sk);
struct sctp_association *asoc; struct sctp_association *asoc;
struct sctp_ulpevent *event; int i;
if (optlen > sizeof(struct sctp_event_subscribe)) if (optlen > sizeof(struct sctp_event_subscribe))
return -EINVAL; return -EINVAL;
if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen))
if (copy_from_user(&subscribe, optval, optlen))
return -EFAULT; return -EFAULT;
for (i = 0; i < optlen; i++)
sctp_ulpevent_type_set(&sp->subscribe, SCTP_SN_TYPE_BASE + i,
sn_type[i]);
list_for_each_entry(asoc, &sp->ep->asocs, asocs)
asoc->subscribe = sctp_sk(sk)->subscribe;
/* At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT, /* At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
* if there is no data to be sent or retransmit, the stack will * if there is no data to be sent or retransmit, the stack will
* immediately send up this notification. * immediately send up this notification.
*/ */
if (sctp_ulpevent_type_enabled(SCTP_SENDER_DRY_EVENT, if (sctp_ulpevent_type_enabled(sp->subscribe, SCTP_SENDER_DRY_EVENT)) {
&sctp_sk(sk)->subscribe)) { struct sctp_ulpevent *event;
asoc = sctp_id2assoc(sk, 0);
asoc = sctp_id2assoc(sk, 0);
if (asoc && sctp_outq_is_empty(&asoc->outqueue)) { if (asoc && sctp_outq_is_empty(&asoc->outqueue)) {
event = sctp_ulpevent_make_sender_dry_event(asoc, event = sctp_ulpevent_make_sender_dry_event(asoc,
GFP_USER | __GFP_NOWARN); GFP_USER | __GFP_NOWARN);
...@@ -4277,6 +4288,57 @@ static int sctp_setsockopt_reuse_port(struct sock *sk, char __user *optval, ...@@ -4277,6 +4288,57 @@ static int sctp_setsockopt_reuse_port(struct sock *sk, char __user *optval,
return 0; return 0;
} }
static int sctp_setsockopt_event(struct sock *sk, char __user *optval,
unsigned int optlen)
{
struct sctp_association *asoc;
struct sctp_ulpevent *event;
struct sctp_event param;
int retval = 0;
if (optlen < sizeof(param)) {
retval = -EINVAL;
goto out;
}
optlen = sizeof(param);
if (copy_from_user(&param, optval, optlen)) {
retval = -EFAULT;
goto out;
}
if (param.se_type < SCTP_SN_TYPE_BASE ||
param.se_type > SCTP_SN_TYPE_MAX) {
retval = -EINVAL;
goto out;
}
asoc = sctp_id2assoc(sk, param.se_assoc_id);
if (!asoc) {
sctp_ulpevent_type_set(&sctp_sk(sk)->subscribe,
param.se_type, param.se_on);
goto out;
}
sctp_ulpevent_type_set(&asoc->subscribe, param.se_type, param.se_on);
if (param.se_type == SCTP_SENDER_DRY_EVENT && param.se_on) {
if (sctp_outq_is_empty(&asoc->outqueue)) {
event = sctp_ulpevent_make_sender_dry_event(asoc,
GFP_USER | __GFP_NOWARN);
if (!event) {
retval = -ENOMEM;
goto out;
}
asoc->stream.si->enqueue_event(&asoc->ulpq, event);
}
}
out:
return retval;
}
/* API 6.2 setsockopt(), getsockopt() /* API 6.2 setsockopt(), getsockopt()
* *
* Applications use setsockopt() and getsockopt() to set or retrieve * Applications use setsockopt() and getsockopt() to set or retrieve
...@@ -4474,6 +4536,9 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, ...@@ -4474,6 +4536,9 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
case SCTP_REUSE_PORT: case SCTP_REUSE_PORT:
retval = sctp_setsockopt_reuse_port(sk, optval, optlen); retval = sctp_setsockopt_reuse_port(sk, optval, optlen);
break; break;
case SCTP_EVENT:
retval = sctp_setsockopt_event(sk, optval, optlen);
break;
default: default:
retval = -ENOPROTOOPT; retval = -ENOPROTOOPT;
break; break;
...@@ -4722,7 +4787,7 @@ static int sctp_init_sock(struct sock *sk) ...@@ -4722,7 +4787,7 @@ static int sctp_init_sock(struct sock *sk)
/* Initialize default event subscriptions. By default, all the /* Initialize default event subscriptions. By default, all the
* options are off. * options are off.
*/ */
memset(&sp->subscribe, 0, sizeof(struct sctp_event_subscribe)); sp->subscribe = 0;
/* Default Peer Address Parameters. These defaults can /* Default Peer Address Parameters. These defaults can
* be modified via SCTP_PEER_ADDR_PARAMS * be modified via SCTP_PEER_ADDR_PARAMS
...@@ -5267,14 +5332,24 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len, ...@@ -5267,14 +5332,24 @@ static int sctp_getsockopt_disable_fragments(struct sock *sk, int len,
static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval, static int sctp_getsockopt_events(struct sock *sk, int len, char __user *optval,
int __user *optlen) int __user *optlen)
{ {
struct sctp_event_subscribe subscribe;
__u8 *sn_type = (__u8 *)&subscribe;
int i;
if (len == 0) if (len == 0)
return -EINVAL; return -EINVAL;
if (len > sizeof(struct sctp_event_subscribe)) if (len > sizeof(struct sctp_event_subscribe))
len = sizeof(struct sctp_event_subscribe); len = sizeof(struct sctp_event_subscribe);
if (put_user(len, optlen)) if (put_user(len, optlen))
return -EFAULT; return -EFAULT;
if (copy_to_user(optval, &sctp_sk(sk)->subscribe, len))
for (i = 0; i < len; i++)
sn_type[i] = sctp_ulpevent_type_enabled(sctp_sk(sk)->subscribe,
SCTP_SN_TYPE_BASE + i);
if (copy_to_user(optval, &subscribe, len))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
...@@ -7409,6 +7484,37 @@ static int sctp_getsockopt_reuse_port(struct sock *sk, int len, ...@@ -7409,6 +7484,37 @@ static int sctp_getsockopt_reuse_port(struct sock *sk, int len,
return 0; return 0;
} }
static int sctp_getsockopt_event(struct sock *sk, int len, char __user *optval,
int __user *optlen)
{
struct sctp_association *asoc;
struct sctp_event param;
__u16 subscribe;
if (len < sizeof(param))
return -EINVAL;
len = sizeof(param);
if (copy_from_user(&param, optval, len))
return -EFAULT;
if (param.se_type < SCTP_SN_TYPE_BASE ||
param.se_type > SCTP_SN_TYPE_MAX)
return -EINVAL;
asoc = sctp_id2assoc(sk, param.se_assoc_id);
subscribe = asoc ? asoc->subscribe : sctp_sk(sk)->subscribe;
param.se_on = sctp_ulpevent_type_enabled(subscribe, param.se_type);
if (put_user(len, optlen))
return -EFAULT;
if (copy_to_user(optval, &param, len))
return -EFAULT;
return 0;
}
static int sctp_getsockopt(struct sock *sk, int level, int optname, static int sctp_getsockopt(struct sock *sk, int level, int optname,
char __user *optval, int __user *optlen) char __user *optval, int __user *optlen)
{ {
...@@ -7607,6 +7713,9 @@ static int sctp_getsockopt(struct sock *sk, int level, int optname, ...@@ -7607,6 +7713,9 @@ static int sctp_getsockopt(struct sock *sk, int level, int optname,
case SCTP_REUSE_PORT: case SCTP_REUSE_PORT:
retval = sctp_getsockopt_reuse_port(sk, len, optval, optlen); retval = sctp_getsockopt_reuse_port(sk, len, optval, optlen);
break; break;
case SCTP_EVENT:
retval = sctp_getsockopt_event(sk, len, optval, optlen);
break;
default: default:
retval = -ENOPROTOOPT; retval = -ENOPROTOOPT;
break; break;
......
...@@ -503,7 +503,7 @@ static int sctp_enqueue_event(struct sctp_ulpq *ulpq, ...@@ -503,7 +503,7 @@ static int sctp_enqueue_event(struct sctp_ulpq *ulpq,
sk_incoming_cpu_update(sk); sk_incoming_cpu_update(sk);
} }
if (!sctp_ulpevent_is_enabled(event, &sp->subscribe)) if (!sctp_ulpevent_is_enabled(event, ulpq->asoc->subscribe))
goto out_free; goto out_free;
if (skb_list) if (skb_list)
...@@ -994,17 +994,19 @@ static void sctp_intl_stream_abort_pd(struct sctp_ulpq *ulpq, __u16 sid, ...@@ -994,17 +994,19 @@ static void sctp_intl_stream_abort_pd(struct sctp_ulpq *ulpq, __u16 sid,
struct sock *sk = ulpq->asoc->base.sk; struct sock *sk = ulpq->asoc->base.sk;
struct sctp_ulpevent *ev = NULL; struct sctp_ulpevent *ev = NULL;
if (!sctp_ulpevent_type_enabled(SCTP_PARTIAL_DELIVERY_EVENT, if (!sctp_ulpevent_type_enabled(ulpq->asoc->subscribe,
&sctp_sk(sk)->subscribe)) SCTP_PARTIAL_DELIVERY_EVENT))
return; return;
ev = sctp_ulpevent_make_pdapi(ulpq->asoc, SCTP_PARTIAL_DELIVERY_ABORTED, ev = sctp_ulpevent_make_pdapi(ulpq->asoc, SCTP_PARTIAL_DELIVERY_ABORTED,
sid, mid, flags, gfp); sid, mid, flags, gfp);
if (ev) { if (ev) {
struct sctp_sock *sp = sctp_sk(sk);
__skb_queue_tail(&sk->sk_receive_queue, sctp_event2skb(ev)); __skb_queue_tail(&sk->sk_receive_queue, sctp_event2skb(ev));
if (!sctp_sk(sk)->data_ready_signalled) { if (!sp->data_ready_signalled) {
sctp_sk(sk)->data_ready_signalled = 1; sp->data_ready_signalled = 1;
sk->sk_data_ready(sk); sk->sk_data_ready(sk);
} }
} }
......
...@@ -219,7 +219,7 @@ int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event) ...@@ -219,7 +219,7 @@ int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event)
sk_incoming_cpu_update(sk); sk_incoming_cpu_update(sk);
} }
/* Check if the user wishes to receive this event. */ /* Check if the user wishes to receive this event. */
if (!sctp_ulpevent_is_enabled(event, &sp->subscribe)) if (!sctp_ulpevent_is_enabled(event, ulpq->asoc->subscribe))
goto out_free; goto out_free;
/* If we are in partial delivery mode, post to the lobby until /* If we are in partial delivery mode, post to the lobby until
...@@ -1129,16 +1129,16 @@ void sctp_ulpq_renege(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk, ...@@ -1129,16 +1129,16 @@ void sctp_ulpq_renege(struct sctp_ulpq *ulpq, struct sctp_chunk *chunk,
void sctp_ulpq_abort_pd(struct sctp_ulpq *ulpq, gfp_t gfp) void sctp_ulpq_abort_pd(struct sctp_ulpq *ulpq, gfp_t gfp)
{ {
struct sctp_ulpevent *ev = NULL; struct sctp_ulpevent *ev = NULL;
struct sock *sk;
struct sctp_sock *sp; struct sctp_sock *sp;
struct sock *sk;
if (!ulpq->pd_mode) if (!ulpq->pd_mode)
return; return;
sk = ulpq->asoc->base.sk; sk = ulpq->asoc->base.sk;
sp = sctp_sk(sk); sp = sctp_sk(sk);
if (sctp_ulpevent_type_enabled(SCTP_PARTIAL_DELIVERY_EVENT, if (sctp_ulpevent_type_enabled(ulpq->asoc->subscribe,
&sctp_sk(sk)->subscribe)) SCTP_PARTIAL_DELIVERY_EVENT))
ev = sctp_ulpevent_make_pdapi(ulpq->asoc, ev = sctp_ulpevent_make_pdapi(ulpq->asoc,
SCTP_PARTIAL_DELIVERY_ABORTED, SCTP_PARTIAL_DELIVERY_ABORTED,
0, 0, 0, gfp); 0, 0, 0, gfp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment