Message ID | 1283521623-1609-1-git-send-email-flameeyes@gmail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Diego Elio Pettenò <flameeyes@gmail.com> Date: Fri, 3 Sep 2010 15:47:03 +0200 > From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> > > This simple patch copies the current approach for SIOCINQ ioctl() from DCCP > into SCTP so that the userland code working with SCTP can use a similar > interface across different protocols to know how much space to allocate for > a buffer. > > Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com> Applied, thank you. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index ca44917..199ec05 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -3595,7 +3595,40 @@ out: /* The SCTP ioctl handler. */ SCTP_STATIC int sctp_ioctl(struct sock *sk, int cmd, unsigned long arg) { - return -ENOIOCTLCMD; + int rc = -ENOTCONN; + + sctp_lock_sock(sk); + + /* + * SEQPACKET-style sockets in LISTENING state are valid, for + * SCTP, so only discard TCP-style sockets in LISTENING state. + */ + if (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING)) + goto out; + + switch (cmd) { + case SIOCINQ: { + struct sk_buff *skb; + unsigned int amount = 0; + + skb = skb_peek(&sk->sk_receive_queue); + if (skb != NULL) { + /* + * We will only return the amount of this packet since + * that is all that will be read. + */ + amount = skb->len; + } + rc = put_user(amount, (int __user *)arg); + } + break; + default: + rc = -ENOIOCTLCMD; + break; + } +out: + sctp_release_sock(sk); + return rc; } /* This is the function which gets called during socket creation to