From: Sami Kerola <kerolasa@iki.fi>
To: util-linux@vger.kernel.org
Cc: kerolasa@iki.fi
Subject: [PATCH 13/22] dmesg: add boundary check to facility & level array usage
Date: Sat, 19 Jan 2013 00:09:02 +0000 [thread overview]
Message-ID: <1358554151-25985-14-git-send-email-kerolasa@iki.fi> (raw)
In-Reply-To: <1358554151-25985-1-git-send-email-kerolasa@iki.fi>
The dmesg should not crash while --decode'ing message facilities and
levels to readable string even if the values are out of bounds.
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---
sys-utils/dmesg.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c
index f95db40..ddab9b4 100644
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -803,7 +803,9 @@ static void print_record(struct dmesg_control *ctl,
/*
* facility : priority :
*/
- if (ctl->decode && rec->level >= 0 && rec->facility >= 0)
+ if (ctl->decode &&
+ -1 < rec->level && rec->level < (int) ARRAY_SIZE(level_names) &&
+ -1 < rec->facility && rec->facility < (int) ARRAY_SIZE(facility_names))
printf("%-6s:%-6s: ", facility_names[rec->facility].name,
level_names[rec->level].name);
--
1.8.1.1
next prev parent reply other threads:[~2013-01-19 0:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-19 0:08 [PATCH 00/22] tests: lots of tests Sami Kerola
2013-01-19 0:08 ` [PATCH 01/22] build-sys: add gcov files to .gitignore Sami Kerola
2013-01-19 0:08 ` [PATCH 02/22] tests: add rev(1) check Sami Kerola
2013-01-19 0:08 ` [PATCH 03/22] tests: add utmpdump(1) check Sami Kerola
2013-01-19 0:08 ` [PATCH 04/22] tests: add getopt(1) check Sami Kerola
2013-01-19 0:08 ` [PATCH 05/22] tests: add mcookie(1) check Sami Kerola
2013-01-19 0:08 ` [PATCH 06/22] tests: add tailf(1) check Sami Kerola
2013-01-19 0:08 ` [PATCH 07/22] tests: add ul(1) check Sami Kerola
2013-01-19 0:08 ` [PATCH 08/22] tests: add ionice(1) check Sami Kerola
2013-01-19 0:08 ` [PATCH 09/22] more: allow non-interactive invocation of the command Sami Kerola
2013-01-24 18:33 ` Karel Zak
2013-01-19 0:08 ` [PATCH 10/22] tests: add more(1) check Sami Kerola
2013-01-19 0:09 ` [PATCH 11/22] tests: add line(1) check Sami Kerola
2013-01-19 0:09 ` [PATCH 12/22] tests: add dmesg(1) check Sami Kerola
2013-01-19 0:09 ` Sami Kerola [this message]
2013-01-19 0:09 ` [PATCH 14/22] tests: add setsid(1) check Sami Kerola
2013-01-19 0:09 ` [PATCH 15/22] tests: add setarch(8) check Sami Kerola
2013-01-19 0:09 ` [PATCH 16/22] tests: add fallocate(1) check Sami Kerola
2013-01-19 0:09 ` [PATCH 17/22] docs: mkswap.8: recommend fallocate(1) Sami Kerola
2013-01-25 9:17 ` Karel Zak
2013-01-19 0:09 ` [PATCH 18/22] tests: add isosize(1) check Sami Kerola
2013-01-25 9:25 ` Karel Zak
2013-01-19 0:09 ` [PATCH 19/22] tests: add whereis(1) check Sami Kerola
2013-01-19 0:09 ` [PATCH 20/22] dmesg: parse level when --color is used Sami Kerola
2013-01-19 0:09 ` [PATCH 21/22] tests: add ipcmk(1) and ipcrm(1) checks Sami Kerola
2013-01-19 0:09 ` [PATCH 22/22] tests: sort commands strings Sami Kerola
2013-01-25 10:09 ` [PATCH 00/22] tests: lots of tests Karel Zak
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=1358554151-25985-14-git-send-email-kerolasa@iki.fi \
--to=kerolasa@iki.fi \
--cc=util-linux@vger.kernel.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