From: Theodore Ts'o <tytso@mit.edu>
To: util-linux@vger.kernel.org
Cc: Hornseth_Brenan@bah.com, Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH] fsck: use xasprintf to avoid buffer overruns with an insane fs type
Date: Thu, 15 Feb 2018 15:05:08 -0500 [thread overview]
Message-ID: <20180215200508.1466-1-tytso@mit.edu> (raw)
This prevents a crash when running the command:
fsck -t AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA /dev/sda
Reported-by: Hornseth_Brenan@bah.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
disk-utils/fsck.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 58fd8ac59..8a07bc272 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -544,20 +544,20 @@ static char *find_fsck(const char *type)
{
char *s;
const char *tpl;
- static char prog[256];
+ static char *prog = NULL;
char *p = xstrdup(fsck_path);
/* Are we looking for a program or just a type? */
tpl = (strncmp(type, "fsck.", 5) ? "%s/fsck.%s" : "%s/%s");
for(s = strtok(p, ":"); s; s = strtok(NULL, ":")) {
- sprintf(prog, tpl, s, type);
+ xasprintf(&prog, tpl, s, type);
if (access(prog, X_OK) == 0)
break;
+ free(prog); prog = NULL;
}
free(p);
-
- return(s ? prog : NULL);
+ return(prog);
}
static int progress_active(void)
@@ -885,7 +885,7 @@ static int wait_many(int flags)
*/
static int fsck_device(struct libmnt_fs *fs, int interactive)
{
- char progname[80], *progpath;
+ char *progname, *progpath;
const char *type;
int retval;
@@ -902,9 +902,10 @@ static int fsck_device(struct libmnt_fs *fs, int interactive)
else
type = DEFAULT_FSTYPE;
- sprintf(progname, "fsck.%s", type);
+ xasprintf(&progname, "fsck.%s", type);
progpath = find_fsck(progname);
if (progpath == NULL) {
+ free(progname);
if (fs_check_required(type)) {
retval = ENOENT;
goto err;
@@ -914,6 +915,8 @@ static int fsck_device(struct libmnt_fs *fs, int interactive)
num_running++;
retval = execute(progname, progpath, type, fs, interactive);
+ free(progname);
+ free(progpath);
if (retval) {
num_running--;
goto err;
--
2.16.1.72.g5be1f00a9a
next reply other threads:[~2018-02-15 20:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-15 20:05 Theodore Ts'o [this message]
2018-02-16 9:54 ` [PATCH] fsck: use xasprintf to avoid buffer overruns with an insane fs type Karel Zak
2018-02-16 15:55 ` Peter Cordes
2018-02-16 17:10 ` Theodore Ts'o
2018-02-16 18:08 ` Karel Zak
2018-02-17 0:29 ` Peter Cordes
2018-02-17 6:46 ` Theodore Ts'o
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=20180215200508.1466-1-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=Hornseth_Brenan@bah.com \
--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