diff options
| author | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-08-20 15:16:24 +0300 |
|---|---|---|
| committer | Artem Bityutskiy <artem.bityutskiy@linux.intel.com> | 2012-08-21 15:25:24 +0300 |
| commit | 11e3be0be2a1314e0861304857e7efcaed5d3e54 (patch) | |
| tree | 7d6590ea687c8cc0f22246bcdc3f2cb3de57174f /fs/ubifs | |
| parent | 73e8712aa02d924844fbd5bd84a2445a1c3f68d7 (diff) | |
| download | lwn-11e3be0be2a1314e0861304857e7efcaed5d3e54.tar.gz lwn-11e3be0be2a1314e0861304857e7efcaed5d3e54.zip | |
UBIFS: fix crash on error path
This patch fixes a regression introduced by
"4994297 UBIFS: make ubifs_lpt_init clean-up in case of failure" which
I've hit while running the 'integck -p' test. When remount the file-system
from R/O mode to R/W mode and 'lpt_init_wr()' fails, we free _all_ LPT
resources by calling 'ubifs_lpt_free(c, 0)', even those needed for R/O
mode. This leads to subsequent crashes, e.g., if we try to unmount
the file-system.
Cc: stable@vger.kernel.org [v3.5+]
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Diffstat (limited to 'fs/ubifs')
| -rw-r--r-- | fs/ubifs/lpt.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/ubifs/lpt.c b/fs/ubifs/lpt.c index ce33b2beb151..8640920766ed 100644 --- a/fs/ubifs/lpt.c +++ b/fs/ubifs/lpt.c @@ -1749,7 +1749,10 @@ int ubifs_lpt_init(struct ubifs_info *c, int rd, int wr) return 0; out_err: - ubifs_lpt_free(c, 0); + if (wr) + ubifs_lpt_free(c, 1); + if (rd) + ubifs_lpt_free(c, 0); return err; } |