diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-05-12 12:08:02 +0530 |
|---|---|---|
| committer | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-05-12 12:08:02 +0530 |
| commit | ed4391aacb68993811c817d591a53d075af9ac12 (patch) | |
| tree | 0f518af8553d1ab22d4615f1c6a69e420b43a9fd /net | |
| parent | f163157f7a299b4646e0c005a8658d5926125b8f (diff) | |
| parent | ea88a24912c191babee3a3a2658ade2d53b880a9 (diff) | |
| download | kernel_samsung_aries-ed4391aacb68993811c817d591a53d075af9ac12.zip kernel_samsung_aries-ed4391aacb68993811c817d591a53d075af9ac12.tar.gz kernel_samsung_aries-ed4391aacb68993811c817d591a53d075af9ac12.tar.bz2 | |
Merge tag 'v3.0.78' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD
This is the 3.0.78 stable release
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_pe_sip.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/netfilter/ipvs/ip_vs_pe_sip.c b/net/netfilter/ipvs/ip_vs_pe_sip.c index 13d607a..87ecf75 100644 --- a/net/netfilter/ipvs/ip_vs_pe_sip.c +++ b/net/netfilter/ipvs/ip_vs_pe_sip.c @@ -37,14 +37,10 @@ static int get_callid(const char *dptr, unsigned int dataoff, if (ret > 0) break; if (!ret) - return 0; + return -EINVAL; dataoff += *matchoff; } - /* Empty callid is useless */ - if (!*matchlen) - return -EINVAL; - /* Too large is useless */ if (*matchlen > IP_VS_PEDATA_MAXLEN) return -EINVAL; |