| From 96684accc660434524bb92f420b898ae4edf6a4f Mon Sep 17 00:00:00 2001 |
| From: Chris Wright <chrisw@sous-sol.org> |
| Date: Mon, 5 May 2008 13:50:24 -0700 |
| Subject: dccp: return -EINVAL on invalid feature length |
| |
| From: Chris Wright <chrisw@sous-sol.org> |
| |
| [ Upstream commit: 19443178fbfbf40db15c86012fc37df1a44ab857 ] |
| |
| dccp_feat_change() validates length and on error is returning 1. |
| This happens to work since call chain is checking for 0 == success, |
| but this is returned to userspace, so make it a real error value. |
| |
| Signed-off-by: Chris Wright <chrisw@sous-sol.org> |
| Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/dccp/feat.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/dccp/feat.c |
| +++ b/net/dccp/feat.c |
| @@ -32,7 +32,7 @@ int dccp_feat_change(struct dccp_minisoc |
| |
| if (len > 3) { |
| DCCP_WARN("invalid length %d\n", len); |
| - return 1; |
| + return -EINVAL; |
| } |
| /* XXX add further sanity checks */ |
| |