public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Jim Meyering <meyering@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: gfs2-utils: master - hexedit: avoid NULL dereference upon failed malloc Date: Thu, 02 Jul 2009 11:05:00 -0000 [thread overview] Message-ID: <20090702110528.EF3261201C1@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdiff;h=3b256287f994e564ec7a6c580003d77029a246bf Commit: 3b256287f994e564ec7a6c580003d77029a246bf Parent: c1309888b4824577cc334f3fcdb2b9bbcbe4a84b Author: Jim Meyering <meyering@redhat.com> AuthorDate: Wed Jun 17 16:54:03 2009 +0200 Committer: Jim Meyering <meyering@redhat.com> CommitterDate: Thu Jul 2 13:04:05 2009 +0200 hexedit: avoid NULL dereference upon failed malloc * gfs2/edit/hexedit.c (display_indirect): Avoid unchecked malloc by declaring more_indir on the stack. --- gfs2/edit/hexedit.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c index f9b9bb4..5c66995 100644 --- a/gfs2/edit/hexedit.c +++ b/gfs2/edit/hexedit.c @@ -1416,13 +1416,12 @@ static int display_indirect(struct iinfo *ind, int indblocks, int level, uint64_ file_offset = 0; if (!termlines && ((level + 1 < di.di_height) || (S_ISDIR(di.di_mode) && !level))) { - struct iinfo *more_indir; int more_ind; char *tmpbuf; - more_indir = malloc(sizeof(struct iinfo)); tmpbuf = malloc(sbd.bsize); if (tmpbuf) { + struct iinfo more_indir; lseek(sbd.device_fd, ind->ii[pndx].block * sbd.bsize, SEEK_SET); @@ -1437,20 +1436,19 @@ static int display_indirect(struct iinfo *ind, int indblocks, int level, uint64_ (unsigned long long)ind->ii[pndx].block); exit(-1); } - memset(more_indir, 0, sizeof(struct iinfo)); + memset(&more_indir, 0, sizeof(struct iinfo)); if (S_ISDIR(di.di_mode)) { - do_leaf_extended(tmpbuf, more_indir); - display_leaf(more_indir); + do_leaf_extended(tmpbuf, &more_indir); + display_leaf(&more_indir); } else { more_ind = do_indirect_extended(tmpbuf, - more_indir); - display_indirect(more_indir, + &more_indir); + display_indirect(&more_indir, more_ind, level + 1, file_offset); } free(tmpbuf); } - free(more_indir); } print_entry_ndx = pndx; /* restore after recursion */ eol(0);
reply other threads:[~2009-07-02 11:05 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20090702110528.EF3261201C1@lists.fedorahosted.org \ --to=meyering@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /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: linkBe 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 read-only IMAP folder(s) and NNTP newsgroup(s).