[PATCH] sctp: implement SIOCINQ ioctl() (take 2)

[PATCH] sctp: implement SIOCINQ ioctl() (take 2)

[Diego Elio Pettenò]

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.
---
 net/sctp/socket.c |   35 ++++++++++++++++++++++++++++++++++-
 1 files changed, 34 insertions(+), 1 deletions(-)

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index ca44917..54c01e4 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 long 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
-- 
1.7.2.2

Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 2)

[Shan Wei]

Forward to linux-sctp maillist.


Diego Elio Pettenò wrote, at 09/03/2010 09:14 AM:
> 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.

lack of your singed-of-by.


-- 
Best Regards
-----
Shan Wei

> ---
>  net/sctp/socket.c |   35 ++++++++++++++++++++++++++++++++++-
>  1 files changed, 34 insertions(+), 1 deletions(-)
> 
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index ca44917..54c01e4 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 long 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

Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 2)

[Eric Dumazet]

Le vendredi 03 septembre 2010 à 03:14 +0200, Diego Elio Pettenò a
écrit :
> 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.
> ---
>  net/sctp/socket.c |   35 ++++++++++++++++++++++++++++++++++-
>  1 files changed, 34 insertions(+), 1 deletions(-)
> 
> diff --git a/net/sctp/socket.c b/net/sctp/socket.c
> index ca44917..54c01e4 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 long amount = 0;

why use an 'unsigned long', since user pointer is a 'int *' ?

> +
> +		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

Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 2)

[Diego Elio Pettenò]

Il giorno ven, 03/09/2010 alle 08.55 +0200, Eric Dumazet ha scritto:
> 
> 
> why use an 'unsigned long', since user pointer is a 'int *' ? 

I really just picked up the basic SIOCINQ from UDP/RDP

-- 
Diego Elio Pettenò — “Flameeyes”
http://blog.flameeyes.eu/

If you found a .asc file in this mail and know not what it is,
it's a GnuPG digital signature: http://www.gnupg.org/

Re: [PATCH] sctp: implement SIOCINQ ioctl() (take 2)

[Eric Dumazet]

Le vendredi 03 septembre 2010 à 14:39 +0200, Diego Elio Pettenò a
écrit :
> Il giorno ven, 03/09/2010 alle 08.55 +0200, Eric Dumazet ha scritto:
> > 
> > 
> > why use an 'unsigned long', since user pointer is a 'int *' ? 
> 
> I really just picked up the basic SIOCINQ from UDP/RDP
> 

I see, dont copy it then :)

net/ipv4/udp.c is right :

        case SIOCOUTQ:
        {
                int amount = sk_wmem_alloc_get(sk);

                return put_user(amount, (int __user *)arg);
        }

        case SIOCINQ:
        {
                unsigned int amount = first_packet_length(sk);

                if (amount)
                        /*
                         * We will only return the amount
                         * of this packet since that is all
                         * that will be read.
                         */
                        amount -= sizeof(struct udphdr);

                return put_user(amount, (int __user *)arg);
        }


Lets try to make it right too for sctp ;)

Thanks