From: Tong Zhang <ztong0001@gmail.com>
To: pablo@netfilter.org, kadlec@netfilter.org, fw@strlen.de,
davem@davemloft.net, kuba@kernel.org,
netfilter-devel@vger.kernel.org, coreteam@netfilter.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: ztong0001@gmail.com
Subject: [PATCH] netfilter: nf_conntrack_sip: fix parsing error
Date: Sat, 15 Aug 2020 12:50:30 -0400 [thread overview]
Message-ID: <20200815165030.5849-1-ztong0001@gmail.com> (raw)
ct_sip_parse_numerical_param can only return 0 or 1, but the caller is
checking parsing error using < 0
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
---
net/netfilter/nf_conntrack_sip.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index b83dc9bf0a5d..08873694120a 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -1269,7 +1269,7 @@ static int process_register_request(struct sk_buff *skb, unsigned int protoff,
if (ct_sip_parse_numerical_param(ct, *dptr,
matchoff + matchlen, *datalen,
- "expires=", NULL, NULL, &expires) < 0) {
+ "expires=", NULL, NULL, &expires) == 0) {
nf_ct_helper_log(skb, ct, "cannot parse expires");
return NF_DROP;
}
@@ -1375,7 +1375,7 @@ static int process_register_response(struct sk_buff *skb, unsigned int protoff,
matchoff + matchlen,
*datalen, "expires=",
NULL, NULL, &c_expires);
- if (ret < 0) {
+ if (ret == 0) {
nf_ct_helper_log(skb, ct, "cannot parse expires");
return NF_DROP;
}
--
2.25.1
next reply other threads:[~2020-08-15 22:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-15 16:50 Tong Zhang [this message]
2020-08-15 22:50 ` [PATCH] netfilter: nf_conntrack_sip: fix parsing error Florian Westphal
2020-08-28 18:07 ` Pablo Neira Ayuso
2020-08-28 18:14 ` Tong Zhang
2020-08-28 18:19 ` Pablo Neira Ayuso
2020-08-28 18:30 ` Tong Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200815165030.5849-1-ztong0001@gmail.com \
--to=ztong0001@gmail.com \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=fw@strlen.de \
--cc=kadlec@netfilter.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=pablo@netfilter.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).