| To: | Mark Tinguely <tinguely@xxxxxxx> |
|---|---|
| Subject: | [PATCH v2] xfsprogs: fix potential memory leak in verify_set_primary_sb() |
| From: | Li Zhong <zhong@xxxxxxxxxxxxxxxxxx> |
| Date: | Wed, 25 Sep 2013 15:32:07 +0800 |
| Cc: | xfsprogs <xfs@xxxxxxxxxxx>, Chandra Seetharaman <sekharan@xxxxxxxxxx> |
| Delivered-to: | xfs@xxxxxxxxxxx |
| In-reply-to: | <5241E125.7010902@xxxxxxx> |
| References: | <1379829679.4089.2.camel@ThinkPad-T5421> <5241E125.7010902@xxxxxxx> |
This patch tries to fix CID 997012, 997013 and 997014 reported by Coverity scan,
as suggested by sekharan.
v2: as Mark pointed out, out in the for loop before also needs list to
be freed. Also remove out lable as it is not referenced any more.
Signed-off-by: Li Zhong <zhong@xxxxxxxxxxxxxxxxxx>
---
repair/sb.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/repair/sb.c b/repair/sb.c
index aa550e3..d34d7a2 100644
--- a/repair/sb.c
+++ b/repair/sb.c
@@ -733,7 +733,7 @@ verify_set_primary_sb(xfs_sb_t *rsb,
if (get_sb(sb, off, size, agno) == XR_EOF) {
retval = 1;
- goto out;
+ goto out_free_list;
}
if (verify_sb(sb, 0) == XR_OK) {
@@ -756,8 +756,10 @@ verify_set_primary_sb(xfs_sb_t *rsb,
/*
* see if we have enough superblocks to bother with
*/
- if (num_ok < num_sbs / 2)
- return(XR_INSUFF_SEC_SB);
+ if (num_ok < num_sbs / 2) {
+ retval = XR_INSUFF_SEC_SB;
+ goto out_free_list;
+ }
current = get_best_geo(list);
@@ -841,7 +843,6 @@ verify_set_primary_sb(xfs_sb_t *rsb,
out_free_list:
free_geo(list);
-out:
free(sb);
free(checked);
return(retval);
--
1.8.1.4
|
| Previous by Date: | Impact Financial Solution 3% Loan Offer, infoimpactfinsolutions |
|---|---|
| Next by Date: | Re: [PATCH] xfsprogs: fix potential memory leak in verify_set_primary_sb(), Li Zhong |
| Previous by Thread: | Re: [PATCH] xfsprogs: fix potential memory leak in verify_set_primary_sb(), Mark Tinguely |
| Next by Thread: | Re: [PATCH v2] xfsprogs: fix potential memory leak in verify_set_primary_sb(), Mark Tinguely |
| Indexes: | [Date] [Thread] [Top] [All Lists] |