From: Phil Sutter <phil@nwl.cc>
To: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: netfilter-devel@vger.kernel.org
Subject: [nft PATCH] erec: Sanitize erec location indesc
Date: Tue, 26 Jan 2021 18:55:02 +0100 [thread overview]
Message-ID: <20210126175502.9171-1-phil@nwl.cc> (raw)
erec_print() unconditionally dereferences erec->locations->indesc, so
make sure it is valid when either creating an erec or adding a location.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
src/erec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/erec.c b/src/erec.c
index c550a596b38c8..5c3351a512464 100644
--- a/src/erec.c
+++ b/src/erec.c
@@ -38,7 +38,8 @@ void erec_add_location(struct error_record *erec, const struct location *loc)
{
assert(erec->num_locations < EREC_LOCATIONS_MAX);
erec->locations[erec->num_locations] = *loc;
- erec->locations[erec->num_locations].indesc = loc->indesc;
+ erec->locations[erec->num_locations].indesc = loc->indesc ?
+ : &internal_indesc;
erec->num_locations++;
}
--
2.28.0
next reply other threads:[~2021-01-26 23:17 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-26 17:55 Phil Sutter [this message]
2021-02-03 0:38 ` [nft PATCH] erec: Sanitize erec location indesc Pablo Neira Ayuso
2021-02-03 10:45 ` Phil Sutter
2021-02-09 13:15 ` Pablo Neira Ayuso
2021-02-09 13:22 ` Pablo Neira Ayuso
2021-02-09 14:11 ` Phil Sutter
2021-02-09 15:50 ` Pablo Neira Ayuso
2021-02-09 15:53 ` Pablo Neira Ayuso
2021-02-09 15:54 ` Pablo Neira Ayuso
2021-02-09 16:01 ` Phil Sutter
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=20210126175502.9171-1-phil@nwl.cc \
--to=phil@nwl.cc \
--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).