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

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

[@ 2010-06-24 14:16 UTC (permalink / raw)]

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 44a1ab0..f339383 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.1

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

[Diego Elio 'Flameeyes' Pettenò]

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 44a1ab0..f339383 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.1

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

[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.

Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
---
 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..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
-- 
1.7.2.2

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

[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.

Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
---
 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..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
-- 
1.7.2.2

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

[David Miller]

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.

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

[David Miller]

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.

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

[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.

Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
---
 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..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
-- 
1.7.3

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

[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.

Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
---
 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..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
-- 
1.7.3

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

[David Miller]

From: Diego Elio Pettenò <flameeyes@gmail.com>
Date: Wed, 29 Sep 2010 03:51:35 +0200

> +		rc = put_user(amount, (int __user *)arg);
> +	}
> +		break;

Please put the break statement inside of the basic block.

The way you have it here the indentation looks not so nice.

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

[David Miller]

From: Diego Elio Pettenò <flameeyes@gmail.com>
Date: Wed, 29 Sep 2010 03:51:35 +0200

> +		rc = put_user(amount, (int __user *)arg);
> +	}
> +		break;

Please put the break statement inside of the basic block.

The way you have it here the indentation looks not so nice.

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

[Diego Elio Pettenò]

Il giorno gio, 30/09/2010 alle 17.35 -0700, David Miller ha scritto:
> 
> 
> Please put the break statement inside of the basic block.
> 
> The way you have it here the indentation looks not so nice. 

Okay will resend; please do note that I copied the style (and most of
the code) from dccp anyway.

-- 
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 3)

[Diego Elio Pettenò]

Il giorno gio, 30/09/2010 alle 17.35 -0700, David Miller ha scritto:
> 
> 
> Please put the break statement inside of the basic block.
> 
> The way you have it here the indentation looks not so nice. 

Okay will resend; please do note that I copied the style (and most of
the code) from dccp anyway.

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

[PATCH] sctp: implement SIOCINQ ioctl() (take 3 bis)

[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.

Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
---
 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..8872028 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
-- 
1.7.3.1

[PATCH] sctp: implement SIOCINQ ioctl() (take 3 bis)

[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.

Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com>
---
 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..8872028 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
-- 
1.7.3.1

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

[Diego Elio Pettenò]

[-- Attachment #1: Type: text/plain, Size: 594 bytes --]

Il giorno ven, 01/10/2010 alle 11.56 +0200, Diego Elio Pettenò ha
scritto:
> 
> 
> 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. 

Any news on getting this one in? Pretty please? :)

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


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

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

[Diego Elio Pettenò]

[-- Attachment #1: Type: text/plain, Size: 594 bytes --]

Il giorno ven, 01/10/2010 alle 11.56 +0200, Diego Elio Pettenò ha
scritto:
> 
> 
> 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. 

Any news on getting this one in? Pretty please? :)

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


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

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

[David Miller]

From: Diego Elio Pettenò <flameeyes@gmail.com>
Date: Fri, 15 Oct 2010 16:22:37 +0200

> Il giorno ven, 01/10/2010 alle 11.56 +0200, Diego Elio Pettenò ha
> scritto:
>> 
>> 
>> 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. 
> 
> Any news on getting this one in? Pretty please? :)

I'm pretty sure it's in the net-next-2.6, is it not?

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

[David Miller]

From: Diego Elio Pettenò <flameeyes@gmail.com>
Date: Fri, 15 Oct 2010 16:22:37 +0200

> Il giorno ven, 01/10/2010 alle 11.56 +0200, Diego Elio Pettenò ha
> scritto:
>> 
>> 
>> 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. 
> 
> Any news on getting this one in? Pretty please? :)

I'm pretty sure it's in the net-next-2.6, is it not?

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

[Diego Elio Pettenò]

Il giorno ven, 15/10/2010 alle 09.59 -0700, David Miller ha scritto:
> 
> I'm pretty sure it's in the net-next-2.6, is it not? 

Ah yes it is, sorry, I was mislead by the presence in -rc8 of the other
SCTP patches that came afterwards (and because it has been since August
I'm dragging this patch around).

Thank you very much!

-- 
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 3 bis)

[Diego Elio Pettenò]

Il giorno ven, 15/10/2010 alle 09.59 -0700, David Miller ha scritto:
> 
> I'm pretty sure it's in the net-next-2.6, is it not? 

Ah yes it is, sorry, I was mislead by the presence in -rc8 of the other
SCTP patches that came afterwards (and because it has been since August
I'm dragging this patch around).

Thank you very much!

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