[PATCH] Make sure sockets implement splice_read

[PATCH] Make sure sockets implement splice_read

[Rémi Denis-Courmont]

Fixes a segmentation fault when trying to splice from a non-TCP socket.

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
---
 net/socket.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index 7651de0..b6d35cd 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -701,6 +701,9 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
 {
 	struct socket *sock = file->private_data;
 
+	if (unlikely(!sock->ops->splice_read))
+		return -EINVAL;
+
 	return sock->ops->splice_read(sock, ppos, pipe, len, flags);
 }
 
-- 
1.5.4.1

Re: [PATCH] Make sure sockets implement splice_read

[David Miller]

From: Rémi_Denis-Courmont <rdenis@simphalempin.com>
Date: Thu, 14 Feb 2008 18:53:34 +0200

> Fixes a segmentation fault when trying to splice from a non-TCP socket.
> 
> Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

Applied, thank you.

Re: [PATCH] Make sure sockets implement splice_read

[Andi Kleen]

David Miller <davem@davemloft.net> writes:

> From: Rémi_Denis-Courmont <rdenis@simphalempin.com>
> Date: Thu, 14 Feb 2008 18:53:34 +0200
>
>> Fixes a segmentation fault when trying to splice from a non-TCP socket.
>> 
>> Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
>
> Applied, thank you.

That's also a stable candidate, isn't it? 

-Andi

Re: [PATCH] Make sure sockets implement splice_read

[Rémi Denis-Courmont]

Le Friday 15 February 2008 18:30:11 Andi Kleen, vous avez écrit :
> David Miller <davem@davemloft.net> writes:
> > From: Rémi_Denis-Courmont <rdenis@simphalempin.com>
> > Date: Thu, 14 Feb 2008 18:53:34 +0200
> >
> >> Fixes a segmentation fault when trying to splice from a non-TCP socket.
> >>
> >> Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
> >
> > Applied, thank you.
>
> That's also a stable candidate, isn't it?

Should go to 2.6.25-rc2, but the offending code is not in any stable release.

-- 
Rémi Denis-Courmont
http://www.remlab.net/

Re: [PATCH] Make sure sockets implement splice_read

[Andi Kleen]

Rémi Denis-Courmont <rdenis@simphalempin.com> writes:

> Le Friday 15 February 2008 18:30:11 Andi Kleen, vous avez écrit :
>> David Miller <davem@davemloft.net> writes:
>> > From: Rémi_Denis-Courmont <rdenis@simphalempin.com>
>> > Date: Thu, 14 Feb 2008 18:53:34 +0200
>> >
>> >> Fixes a segmentation fault when trying to splice from a non-TCP socket.
>> >>
>> >> Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>
>> >
>> > Applied, thank you.
>>
>> That's also a stable candidate, isn't it?
>
> Should go to 2.6.25-rc2, but the offending code is not in any stable release.

You're right. I misinterpreted git describe output for this one. Sorry.

-Andi