diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-05-17 23:36:24 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-05-17 23:36:24 -0400 |
| commit | 98ee49af2caf98dfe24e8eaefc663689ef9c2e29 (patch) | |
| tree | 6746c78c8d294978838e2bbd36234674a22aee6e /net/netfilter/ipvs/ip_vs_pe_sip.c | |
| parent | c698ab42498c91c8ce7d1a7c625a47e7b52252c3 (diff) | |
| parent | 68233b884a3817fbc54b6763e8b4321c56e57a3a (diff) | |
Merge tag 'v3.4.45' into v3.4-rt
This is the 3.4.45 stable release
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_pe_sip.c')
| -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 1aa5cac748c4..55add9325422 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; |