[GIT PULL] UBI/UBIFS/JFFS2 updates for 5.4-rc1
From: Richard Weinberger
Date: Sat Sep 21 2019 - 03:36:52 EST
Linus,
The following changes since commit 089cf7f6ecb266b6a4164919a2e69bd2f938374a:
Linux 5.3-rc7 (2019-09-02 09:57:40 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git tags/upstream-5.4-rc1
for you to fetch changes up to 6a379f67454a3c740671ed6c7793b76ffecef50b:
jffs2: Fix memory leak in jffs2_scan_eraseblock() error path (2019-09-15 22:42:41 +0200)
Please note that there is a small merge conflict between
9163e0184bd7d5f ("ubifs: Fix memory leak bug in alloc_ubifs_info() error path")
from UBIFS tree and
50d7aad57710e2b ("vfs: Convert ubifs to use the new mount API")
from VFS tree.
----------------------------------------------------------------
This pull request contains the following changes for UBI, UBIFS and JFFS2:
UBI:
- Be less stupid when placing a fastmap anchor
- Try harder to get an empty PEB in case of contention
- Make ubiblock to warn if image is not a multiple of 512
UBIFS:
- Various fixes in error paths
JFFS2:
- Various fixes in error paths
----------------------------------------------------------------
Christoph Hellwig (1):
jffs2: Remove jffs2_gc_fetch_page and jffs2_gc_release_page
Colin Ian King (1):
ubifs: Remove redundant assignment to pointer fname
Jia-Ju Bai (1):
jffs2: Fix possible null-pointer dereferences in jffs2_add_frag_to_fragtree()
Richard Weinberger (2):
ubi: Don't do anchor move within fastmap area
ubi: block: Warn if volume size is not multiple of 512
Wenwen Wang (4):
ubifs: Fix memory leak in read_znode() error path
ubifs: Fix memory leak in __ubifs_node_verify_hmac error path
ubifs: Fix memory leak bug in alloc_ubifs_info() error path
jffs2: Fix memory leak in jffs2_scan_eraseblock() error path
Zhihao Cheng (1):
ubi: ubi_wl_get_peb: Increase the number of attempts while getting PEB
drivers/mtd/ubi/block.c | 43 +++++++++++++++++++++++++++++++++++--------
drivers/mtd/ubi/fastmap-wl.c | 6 +++---
drivers/mtd/ubi/wl.c | 6 ++++++
fs/jffs2/fs.c | 27 ---------------------------
fs/jffs2/gc.c | 21 +++++++++++++--------
fs/jffs2/nodelist.c | 2 +-
fs/jffs2/os-linux.h | 3 ---
fs/jffs2/scan.c | 5 ++++-
fs/ubifs/auth.c | 4 +++-
fs/ubifs/debug.c | 1 -
fs/ubifs/super.c | 4 +++-
fs/ubifs/tnc_misc.c | 1 +
12 files changed, 69 insertions(+), 54 deletions(-)