|
 |
d489081 |
From 797913a0c470da93d44201d074d343953a38589c Mon Sep 17 00:00:00 2001
|
|
|
d489081 |
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
|
|
d489081 |
Date: Fri, 11 Mar 2011 11:06:20 +0100
|
|
|
d489081 |
Subject: [PATCH] Fix ddquot buffer leak
|
|
|
d489081 |
|
|
|
d489081 |
The ddquot buffer is used to tranfer data from/to file. All its data are
|
|
|
d489081 |
copied from/to it, so it's not needed after return from qtree_read_dquot()/
|
|
|
d489081 |
qtree_write_dquot().
|
|
|
d489081 |
---
|
|
|
d489081 |
quotaio_tree.c | 3 +++
|
|
|
d489081 |
1 files changed, 3 insertions(+), 0 deletions(-)
|
|
|
d489081 |
|
|
|
d489081 |
diff --git a/quotaio_tree.c b/quotaio_tree.c
|
|
|
d489081 |
index cdc0e8f..9f87889 100644
|
|
|
d489081 |
--- a/quotaio_tree.c
|
|
|
d489081 |
+++ b/quotaio_tree.c
|
|
|
d489081 |
@@ -272,6 +272,7 @@ void qtree_write_dquot(struct dquot *dquot)
|
|
|
d489081 |
lseek(dquot->dq_h->qh_fd, dquot->dq_dqb.u.v2_mdqb.dqb_off, SEEK_SET);
|
|
|
d489081 |
info->dqi_ops->mem2disk_dqblk(ddquot, dquot);
|
|
|
d489081 |
ret = write(dquot->dq_h->qh_fd, ddquot, info->dqi_entry_size);
|
|
|
d489081 |
+ free(ddquot);
|
|
|
d489081 |
if (ret != info->dqi_entry_size) {
|
|
|
d489081 |
if (ret > 0)
|
|
|
d489081 |
errno = ENOSPC;
|
|
|
d489081 |
@@ -421,11 +422,13 @@ struct dquot *qtree_read_dquot(struct quota_handle *h, qid_t id)
|
|
|
d489081 |
if (ret != info->dqi_entry_size) {
|
|
|
d489081 |
if (ret > 0)
|
|
|
d489081 |
errno = EIO;
|
|
|
d489081 |
+ free(ddquot);
|
|
|
d489081 |
die(2, _("Cannot read quota structure for id %u: %s\n"), dquot->dq_id,
|
|
|
d489081 |
strerror(errno));
|
|
|
d489081 |
}
|
|
|
d489081 |
info->dqi_ops->disk2mem_dqblk(dquot, ddquot);
|
|
|
d489081 |
}
|
|
|
d489081 |
+ free(ddquot);
|
|
|
d489081 |
return dquot;
|
|
|
d489081 |
}
|
|
|
d489081 |
|
|
|
d489081 |
--
|
|
|
d489081 |
1.7.4
|
|
|
d489081 |
|