diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-31 15:25:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-08-31 15:25:01 -0700 |
| commit | 7e5cd6f69735d6294965b20e8d26a3bd68ee726e (patch) | |
| tree | 003b1159b31bbe44c182d04c5b0285fa62816941 /fs/jfs/jfs_imap.c | |
| parent | 3ef96fcfd50b9980470efb1acec7c27a60b98e87 (diff) | |
| parent | 0225e10972fa809728b8d4c1bd2772b3ec3fdb57 (diff) | |
Merge tag 'jfs-6.6' of github.com:kleikamp/linux-shaggy
Pull jfs updates from Dave Kleikamp:
"A few small fixes"
* tag 'jfs-6.6' of github.com:kleikamp/linux-shaggy:
jfs: validate max amount of blocks before allocation.
jfs: remove redundant initialization to pointer ip
jfs: fix invalid free of JFS_IP(ipimap)->i_imap in diUnmount
FS: JFS: (trivial) Fix grammatical error in extAlloc
fs/jfs: prevent double-free in dbUnmount() after failed jfs_remount()
Diffstat (limited to 'fs/jfs/jfs_imap.c')
| -rw-r--r-- | fs/jfs/jfs_imap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c index a40383aa6c84..923a58422c46 100644 --- a/fs/jfs/jfs_imap.c +++ b/fs/jfs/jfs_imap.c @@ -193,6 +193,7 @@ int diUnmount(struct inode *ipimap, int mounterror) * free in-memory control structure */ kfree(imap); + JFS_IP(ipimap)->i_imap = NULL; return (0); } |