From ad6eaba65519dc137778f75f27a06cc72df41744 Mon Sep 17 00:00:00 2001 From: Anatolij Gustschin Date: Thu, 7 Jul 2011 12:25:02 +0200 Subject: [PATCH] --- yaml --- r: 255081 b: refs/heads/master c: 19495f70d1ebcdc732dd3c94f5968a4bff198ae5 h: refs/heads/master i: 255079: 03d4af83b190937c3bbceab718ea8bfe938b1b73 v: v3 --- [refs] | 2 +- trunk/fs/ubifs/recovery.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8c1145a400f8..23408bf326b7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7fa94a9fe26a4925914083a31b5387bca530eb1 +refs/heads/master: 19495f70d1ebcdc732dd3c94f5968a4bff198ae5 diff --git a/trunk/fs/ubifs/recovery.c b/trunk/fs/ubifs/recovery.c index 51bcf4227b29..af02790d9328 100644 --- a/trunk/fs/ubifs/recovery.c +++ b/trunk/fs/ubifs/recovery.c @@ -274,7 +274,8 @@ int ubifs_recover_master_node(struct ubifs_info *c) if (cor1) goto out_err; mst = mst1; - } else if (offs1 == 0 && offs2 + sz >= c->leb_size) { + } else if (offs1 == 0 && + c->leb_size - offs2 - sz < sz) { /* 1st LEB was unmapped and written, 2nd not */ if (cor1) goto out_err;