Merge tag 'v3.10.108' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / net / sctp / ulpevent.h

diff --git a/include/net/sctp/ulpevent.h b/include/net/sctp/ulpevent.h
index ca4693b4e09e4bb879c0ef8e483247c913bffb6b..00c0e5bf5d3ea31550101bcb0f8240dbbd7100c9 100644 (file)
--- a/include/net/sctp/ulpevent.h
+++ b/include/net/sctp/ulpevent.h
@@ -143,8 +143,12 @@ __u16 sctp_ulpevent_get_notification_type(const struct sctp_ulpevent *event);
 static inline int sctp_ulpevent_type_enabled(__u16 sn_type,
                                             struct sctp_event_subscribe *mask)
 {
+       int offset = sn_type - SCTP_SN_TYPE_BASE;
        char *amask = (char *) mask;
-       return amask[sn_type - SCTP_SN_TYPE_BASE];
+
+       if (offset >= sizeof(struct sctp_event_subscribe))
+               return 0;
+       return amask[offset];
 }
 
 /* Given an event subscription, is this event enabled? */