[PATCH] dccp: change L/R must have at least one byte in the dccpsf_val field

[PATCH] dccp: change L/R must have at least one byte in the dccpsf_val field

[Arnaldo Carvalho de Melo]

Hi David, Gerrit,

	Please consider applying.

- Arnaldo

dccp: change L/R must have at least one byte in the dccpsf_val field
    
Thanks to Eugene Teo for reporting this problem.
    
Signed-off-by: Eugene Teo <eugenete@kernel.sg>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index b622d97..1ca3b26 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -474,6 +474,11 @@ static int dccp_setsockopt_change(struct sock *sk, int type,
 
 	if (copy_from_user(&opt, optval, sizeof(opt)))
 		return -EFAULT;
+	/*
+	 * rfc4340: 6.1. Change Options
+	 */
+	if (opt.dccpsf_len < 1)
+		return -EINVAL;
 
 	val = kmalloc(opt.dccpsf_len, GFP_KERNEL);
 	if (!val)

Re: [PATCH] dccp: change L/R must have at least one byte in the dccpsf_val field

[gerrit]

> dccp: change L/R must have at least one byte in the dccpsf_val field
>
> Thanks to Eugene Teo for reporting this problem.
>
> Signed-off-by: Eugene Teo <eugenete@kernel.sg>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>

Dave, can you please apply -- this patch is for mainline only.

The dccp_setsockopt_change() function has been fully removed in the
test tree (
http://eden-feed.erg.abdn.ac.uk/cgi-bin/gitweb.cgi?p=dccp_exp.git;a=commitdiff;h=f1b8d02c7cb03e22037e1590d04f9ec8ab2423eb),
due to problems it caused.

Will be in contact regarding this soon.

Gerrit

Re: [PATCH] dccp: change L/R must have at least one byte in the dccpsf_val field

[David Miller]

From: gerrit@erg.abdn.ac.uk
Date: Wed, 13 Aug 2008 16:04:03 +0100 (BST)

> > dccp: change L/R must have at least one byte in the dccpsf_val field
> >
> > Thanks to Eugene Teo for reporting this problem.
> >
> > Signed-off-by: Eugene Teo <eugenete@kernel.sg>
> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
> 
> Dave, can you please apply -- this patch is for mainline only.

Applied and I'll queue this up for -stable too, thanks everyone.

Re: [PATCH] dccp: change L/R must have at least one byte in the dccpsf_val field

[Eugene Teo]

On Wed, Aug 13, 2008 at 8:55 PM, Arnaldo Carvalho de Melo
<acme@redhat.com> wrote:
> Hi David, Gerrit,
>
>        Please consider applying.
>
> - Arnaldo
>
> dccp: change L/R must have at least one byte in the dccpsf_val field
>
> Thanks to Eugene Teo for reporting this problem.
>
> Signed-off-by: Eugene Teo <eugenete@kernel.sg>

Should be eugeneteo@ instead of eugenete. Thanks.

Eugene

Re: [PATCH] dccp: change L/R must have at least one byte in the dccpsf_val field

[David Miller]

From: "Eugene Teo" <eugeneteo@kernel.sg>
Date: Thu, 14 Aug 2008 09:08:56 +0800

> On Wed, Aug 13, 2008 at 8:55 PM, Arnaldo Carvalho de Melo
> <acme@redhat.com> wrote:
> > Hi David, Gerrit,
> >
> >        Please consider applying.
> >
> > - Arnaldo
> >
> > dccp: change L/R must have at least one byte in the dccpsf_val field
> >
> > Thanks to Eugene Teo for reporting this problem.
> >
> > Signed-off-by: Eugene Teo <eugenete@kernel.sg>
> 
> Should be eugeneteo@ instead of eugenete. Thanks.

I'll fix this up for the -stable submission, this version
is already in my net-2.6 tree and on the way to Linus.

Thanks.