From: Lukas Czerner <lczerner@redhat.com>
To: Namhyung Kim <namhyung@gmail.com>
Cc: Theodore Tso <tytso@mit.edu>, linux-ext4@vger.kernel.org
Subject: Re: [PATCH 12/15] mke2fs: add some error checks into PRS()
Date: Tue, 30 Nov 2010 13:46:07 +0100 (CET) [thread overview]
Message-ID: <alpine.LFD.2.00.1011301340570.3004@dhcp-lab-213.englab.brq.redhat.com> (raw)
In-Reply-To: <1291020917-8671-13-git-send-email-namhyung@gmail.com>
On Mon, 29 Nov 2010, Namhyung Kim wrote:
> Check return value of some functions and exit if unhandled error occurred.
>
> Signed-off-by: Namhyung Kim <namhyung@gmail.com>
> ---
> misc/mke2fs.c | 26 ++++++++++++++++++++++----
> 1 files changed, 22 insertions(+), 4 deletions(-)
>
> diff --git a/misc/mke2fs.c b/misc/mke2fs.c
> index b88decf..6e2092d 100644
> --- a/misc/mke2fs.c
> +++ b/misc/mke2fs.c
> @@ -1108,6 +1108,10 @@ static void PRS(int argc, char *argv[])
> if (oldpath)
> pathlen += strlen(oldpath);
> newpath = malloc(pathlen);
> + if (!newpath) {
> + fprintf(stderr, _("Couldn't allocate memory for new PATH.\n"));
> + exit(1);
> + }
> strcpy(newpath, PATH_SET);
>
> /* Update our PATH to include /sbin */
> @@ -1138,14 +1142,28 @@ static void PRS(int argc, char *argv[])
> profile_set_syntax_err_cb(syntax_err_report);
> retval = profile_init(config_fn, &profile);
> if (retval == ENOENT) {
> - profile_init(default_files, &profile);
> - profile_set_default(profile, mke2fs_default_profile);
> + retval = profile_init(default_files, &profile);
> + if (retval)
> + goto profile_error;
> + retval = profile_set_default(profile, mke2fs_default_profile);
> + if (retval)
> + goto profile_error;
> + } else {
Maybe use "else if (retval)" since profile_init(config_fn, &profile);
might exit successfully (return 0) ?
> +profile_error:
> + fprintf(stderr, _("Couldn't init profile successfully"
> + " (error: %ld).\n"), retval);
> + exit(1);
> }
>
> setbuf(stdout, NULL);
> setbuf(stderr, NULL);
> - add_error_table(&et_ext2_error_table);
> - add_error_table(&et_prof_error_table);
> + retval = add_error_table(&et_ext2_error_table);
> + if (!retval)
> + retval = add_error_table(&et_prof_error_table);
> + if (retval) {
> + fprintf(stderr, _("Unable to add error information.\n"));
> + exit(1);
> + }
> memset(&fs_param, 0, sizeof(struct ext2_super_block));
> fs_param.s_rev_level = 1; /* Create revision 1 filesystems now */
>
>
-Lukas
next prev parent reply other threads:[~2010-11-30 12:46 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-29 8:55 [PATCH 00/15] e2fsprogs cleanups Namhyung Kim
2010-11-29 8:55 ` [PATCH 01/15 RESEND] libext2fs: fix potential build failure with OMIT_COM_ERR Namhyung Kim
2010-12-20 15:04 ` [01/15, " Ted Ts'o
2010-11-29 8:55 ` [PATCH 02/15 RESEND] libext2fs: fix dubious code in ext2fs_numeric_progress_init() Namhyung Kim
2010-12-20 15:04 ` [02/15, " Ted Ts'o
2010-11-29 8:55 ` [PATCH 03/15] mke2fs: simplify inode table block counting Namhyung Kim
2010-11-30 12:01 ` Lukas Czerner
2010-12-01 11:49 ` Namhyung Kim
2010-12-20 15:44 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 04/15] libext2fs: remove unnecessary casts to ext2fs_generic_bitmap Namhyung Kim
2010-12-20 15:50 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 05/15] libext2fs: fix dubious code in ext2fs_unmark_generic_bitmap() Namhyung Kim
2010-12-20 15:54 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 06/15] libext2fs: invalid EXT4_FEATURE_RO_COMPAT_HUGE_FILE checks Namhyung Kim
2010-12-20 15:55 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 07/15] libext2fs: fix error path in ext2fs_update_bb_inode() Namhyung Kim
2010-12-20 16:01 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 08/15] libext2fs: fix memory leak on error path Namhyung Kim
2010-11-30 12:23 ` Lukas Czerner
2010-12-21 23:06 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 09/15] mke2fs: check return value of e2p_os2string() Namhyung Kim
2010-12-21 23:13 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 10/15] mke2fs.8.in: add missing "big" and "huge" usage-type description Namhyung Kim
2010-12-21 23:45 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 11/15] mke2fs: fix determination of size_type Namhyung Kim
2010-11-30 12:33 ` Lukas Czerner
2010-12-01 12:37 ` Namhyung Kim
2010-12-01 15:46 ` Lukas Czerner
2010-12-21 23:45 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 12/15] mke2fs: add some error checks into PRS() Namhyung Kim
2010-11-30 12:46 ` Lukas Czerner [this message]
2010-12-01 12:03 ` Namhyung Kim
2010-12-16 9:40 ` [PATCH v2 " Namhyung Kim
2010-12-16 12:19 ` Lukas Czerner
2010-12-22 1:34 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 13/15] mke2fs: fix potential memory leak in mke2fs_setup_tdb() Namhyung Kim
2010-11-30 13:02 ` Lukas Czerner
2010-12-01 12:32 ` Namhyung Kim
2010-12-16 9:42 ` [PATCH v2 " Namhyung Kim
2010-12-16 12:21 ` Lukas Czerner
2010-11-29 8:55 ` [PATCH 14/15] libext2fs: fix possible memory leak in write_journal_inode() Namhyung Kim
2010-12-22 15:43 ` Ted Ts'o
2010-11-29 8:55 ` [PATCH 15/15] mke2fs.8.in: add ENVIRONMENT section Namhyung Kim
2010-12-22 15:43 ` Ted 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=alpine.LFD.2.00.1011301340570.3004@dhcp-lab-213.englab.brq.redhat.com \
--to=lczerner@redhat.com \
--cc=linux-ext4@vger.kernel.org \
--cc=namhyung@gmail.com \
--cc=tytso@mit.edu \
/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).