diff options
| author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2014-07-16 15:22:29 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-14 08:59:46 -0800 |
| commit | d53133bd0c8e4ad6ca63f9bb26f36cae671284ff (patch) | |
| tree | 567f8136d256628effbd13e8916afd6ce90de11f /fs | |
| parent | c68ab2f9d4e0f91e68822ee18a74058a565d225f (diff) | |
| download | lwn-d53133bd0c8e4ad6ca63f9bb26f36cae671284ff.tar.gz lwn-d53133bd0c8e4ad6ca63f9bb26f36cae671284ff.zip | |
UBIFS: fix free log space calculation
commit ba29e721eb2df6df8f33c1f248388bb037a47914 upstream.
Hu (hujianyang <hujianyang@huawei.com>) discovered an issue in the
'empty_log_bytes()' function, which calculates how many bytes are left in the
log:
"
If 'c->lhead_lnum + 1 == c->ltail_lnum' and 'c->lhead_offs == c->leb_size', 'h'
would equalent to 't' and 'empty_log_bytes()' would return 'c->log_bytes'
instead of 0.
"
At this point it is not clear what would be the consequences of this, and
whether this may lead to any problems, but this patch addresses the issue just
in case.
Tested-by: hujianyang <hujianyang@huawei.com>
Reported-by: hujianyang <hujianyang@huawei.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/log.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/ubifs/log.c b/fs/ubifs/log.c index 3edc4a3dcca3..8d59de86dc9a 100644 --- a/fs/ubifs/log.c +++ b/fs/ubifs/log.c @@ -106,10 +106,14 @@ static inline long long empty_log_bytes(const struct ubifs_info *c) h = (long long)c->lhead_lnum * c->leb_size + c->lhead_offs; t = (long long)c->ltail_lnum * c->leb_size; - if (h >= t) + if (h > t) return c->log_bytes - h + t; - else + else if (h != t) return t - h; + else if (c->lhead_lnum != c->ltail_lnum) + return 0; + else + return c->log_bytes; } /** |