ubifs: Fix memory leak on error condition (6554a56f) · Commits · 戴 / test

If the call to ubifs_read_nnode() fails in ubifs_lpt_calc_hash() an error is returned without freeing the memory allocated to 'buf'. Read and check the root node before allocating the buffer. Detected by CoverityScan, CID 1441025 ("Resource leak") Signed-off-by:

Garry McNulty <garrmcnu@gmail.com> Signed-off-by:

Richard Weinberger <richard@nod.at>

fs/ubifs/lpt.c

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1675,6 +1675,12 @@ int ubifs_lpt_calc_hash(struct ubifs_info c, u8 hash)
	if (!ubifs_authenticated(c))		if (!ubifs_authenticated(c))
	return 0;		return 0;

			if (!c->nroot) {
			err = ubifs_read_nnode(c, NULL, 0);
			if (err)
			return err;
			}

	desc = ubifs_hash_get_desc(c);		desc = ubifs_hash_get_desc(c);
	if (IS_ERR(desc))		if (IS_ERR(desc))
	return PTR_ERR(desc);		return PTR_ERR(desc);
	@@ -1685,12 +1691,6 @@ int ubifs_lpt_calc_hash(struct ubifs_info c, u8 hash)
	goto out;		goto out;
	}		}

	if (!c->nroot) {
	err = ubifs_read_nnode(c, NULL, 0);
	if (err)
	return err;
	}

	cnode = (struct ubifs_cnode *)c->nroot;		cnode = (struct ubifs_cnode *)c->nroot;

	while (cnode) {		while (cnode) {

Admin message