kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

UBIFS: allocate ltab checking buffer on demand

Browse source 
Instead of using pre-allocated 'c->dbg->buf' buffer in
'dbg_check_ltab_lnum()', dynamically allocate it when needed. The
intend is to get rid of the pre-allocated 'c->dbg->buf' buffer and
save 128KiB of RAM (or more if PEB size is larger). Indeed,
currently we allocate this memory even if the user never enables
any self-check, which is wasteful.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
Artem Bityutskiy 2011-03-11 15:56:38 +02:00
parent cd5f7485bb
commit 6fb324a4b0
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
fs/ubifs/lpt_commit.c
View file

@ -1628,29 +1628,35 @@ static int dbg_check_ltab_lnum(struct ubifs_info *c, int lnum)
{ {
int err, len = c->leb_size, dirty = 0, node_type, node_num, node_len; int err, len = c->leb_size, dirty = 0, node_type, node_num, node_len;
int ret; int ret;
void *buf = c->dbg->buf; void *buf, *p;
if (!(ubifs_chk_flags & UBIFS_CHK_LPROPS)) if (!(ubifs_chk_flags & UBIFS_CHK_LPROPS))
return 0; return 0;
buf = p = __vmalloc(c->leb_size, GFP_KERNEL | GFP_NOFS, PAGE_KERNEL);
if (!buf) {
ubifs_err("cannot allocate memory for ltab checking");
return 0;
}
dbg_lp("LEB %d", lnum); dbg_lp("LEB %d", lnum);
err = ubi_read(c->ubi, lnum, buf, 0, c->leb_size); err = ubi_read(c->ubi, lnum, buf, 0, c->leb_size);
if (err) { if (err) {
dbg_msg("ubi_read failed, LEB %d, error %d", lnum, err); dbg_msg("ubi_read failed, LEB %d, error %d", lnum, err);
return err; goto out;
} }
while (1) { while (1) {
if (!is_a_node(c, buf, len)) { if (!is_a_node(c, p, len)) {
int i, pad_len; int i, pad_len;
pad_len = get_pad_len(c, buf, len); pad_len = get_pad_len(c, p, len);
if (pad_len) { if (pad_len) {
buf += pad_len; p += pad_len;
len -= pad_len; len -= pad_len;
dirty += pad_len; dirty += pad_len;
continue; continue;
} }
if (!dbg_is_all_ff(buf, len)) { if (!dbg_is_all_ff(p, len)) {
dbg_msg("invalid empty space in LEB %d at %d", dbg_msg("invalid empty space in LEB %d at %d",
lnum, c->leb_size - len); lnum, c->leb_size - len);
err = -EINVAL; err = -EINVAL;
@ -1668,16 +1674,21 @@ static int dbg_check_ltab_lnum(struct ubifs_info *c, int lnum)
lnum, dirty, c->ltab[i].dirty); lnum, dirty, c->ltab[i].dirty);
err = -EINVAL; err = -EINVAL;
} }
return err; goto out;
} }
node_type = get_lpt_node_type(c, buf, &node_num); node_type = get_lpt_node_type(c, p, &node_num);
node_len = get_lpt_node_len(c, node_type); node_len = get_lpt_node_len(c, node_type);
ret = dbg_is_node_dirty(c, node_type, lnum, c->leb_size - len); ret = dbg_is_node_dirty(c, node_type, lnum, c->leb_size - len);
if (ret == 1) if (ret == 1)
dirty += node_len; dirty += node_len;
buf += node_len; p += node_len;
len -= node_len; len -= node_len;
} }
err = 0;
out:
vfree(buf);
return err;
} }
/** /**