]> git.karo-electronics.de Git - linux-beck.git/commitdiff
net: sctp: deprecate rfc6458, 5.3.2. SCTP_SNDRCV support
authorDaniel Borkmann <dborkman@redhat.com>
Sat, 12 Jul 2014 18:30:40 +0000 (20:30 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Jul 2014 21:40:04 +0000 (14:40 -0700)
With support of SCTP_SNDINFO/SCTP_RCVINFO as described in RFC6458,
5.3.4/5.3.5, we can now deprecate SCTP_SNDRCV. The RFC already
declares it as deprecated:

  This structure mixes the send and receive path. SCTP_SNDINFO
  (described in Section 5.3.4) and SCTP_RCVINFO (described in
  Section 5.3.5) split this information. These structures should
  be used, when possible, since SCTP_SNDRCV is deprecated.

So whenever a user tries to subscribe to sctp_data_io_event via
setsockopt(2) which triggers inclusion of SCTP_SNDRCV cmsg_type,
issue a warning in the log.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/socket.c

index d95a50c013c9b7831d55734264f40ec8c669c3b8..743308f40544c743e3cd78d8e77dab55156d57a5 100644 (file)
@@ -2205,8 +2205,13 @@ static int sctp_setsockopt_events(struct sock *sk, char __user *optval,
        if (copy_from_user(&sctp_sk(sk)->subscribe, optval, optlen))
                return -EFAULT;
 
-       /*
-        * At the time when a user app subscribes to SCTP_SENDER_DRY_EVENT,
+       if (sctp_sk(sk)->subscribe.sctp_data_io_event)
+               pr_warn_ratelimited(DEPRECATED "%s (pid %d) "
+                                   "Requested SCTP_SNDRCVINFO event.\n"
+                                   "Use SCTP_RCVINFO through SCTP_RECVRCVINFO option instead.\n",
+                                   current->comm, task_pid_nr(current));
+
+       /* 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
         * immediately send up this notification.
         */