xfs
[Top] [All Lists]

[PATCH] xfsprogs: fix buffer leak in xlog_print_find_oldest

To: "'linux-xfs@xxxxxxxxxxx'" <linux-xfs@xxxxxxxxxxx>
Subject: [PATCH] xfsprogs: fix buffer leak in xlog_print_find_oldest
From: Eric Sandeen <sandeen@xxxxxxxxxx>
Date: Wed, 31 Jul 2013 20:42:58 -0500
Delivered-to: linux-xfs@xxxxxxxxxxx
User-agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130620 Thunderbird/17.0.7
The error path in this function did not free the buffer
before returning.

Coverity found this one.

Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
---

diff --git a/logprint/log_print_all.c b/logprint/log_print_all.c
index dfd76b7..d0c2959 100644
--- a/logprint/log_print_all.c
+++ b/logprint/log_print_all.c
@@ -29,7 +29,7 @@ xlog_print_find_oldest(
        xfs_buf_t       *bp;
        xfs_daddr_t     first_blk;
        uint            first_half_cycle, last_half_cycle;
-       int             error;
+       int             error = 0;
 
        if (xlog_find_zeroed(log, &first_blk))
                return 0;
@@ -43,17 +43,14 @@ xlog_print_find_oldest(
        last_half_cycle = xlog_get_cycle(XFS_BUF_PTR(bp));
        ASSERT(last_half_cycle != 0);
 
-       if (first_half_cycle == last_half_cycle) { /* all cycle nos are same */
+       if (first_half_cycle == last_half_cycle) /* all cycle nos are same */
                *last_blk = 0;
-       } else {                /* have 1st and last; look for middle cycle */
+       else            /* have 1st and last; look for middle cycle */
                error = xlog_find_cycle_start(log, bp, first_blk,
                                              last_blk, last_half_cycle);
-               if (error)
-                       return error;
-       }
 
        xlog_put_bp(bp);
-       return 0;
+       return error;
 }
 
 void


<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] xfsprogs: fix buffer leak in xlog_print_find_oldest, Eric Sandeen <=