Merge tag 'pull-fixes.ufs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

263a25de · Linus Torvalds <[email protected]> · 2024-10-03 17:03:18 -07:00

Pull ufs fix from Al Viro:
 "Fix ufs_rename() braino introduced this cycle.

  The 'folio_release_kmap(dir_folio, new_dir)' in ufs_rename() part of
  folio conversion should've been getting a pointer to ufs directory
  entry within the page, rather than a pointer to directory struct
  inode..."

* tag 'pull-fixes.ufs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ufs_rename(): fix bogus argument of folio_release_kmap()

Commit: 263a25de5b6002da3b27bc33a36c51ecfc086b35
Parents: 3840cbe2 · 0d0b8646

Merge commit. Changes below are compared with the first parent: 3840cbe2.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/ufs/namei.c	modified	+1	−1	View file

fs/ufs/namei.c

View file

diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index 24bd121..c839097 100644
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -307,7 +307,7 @@ static int ufs_rename(struct mnt_idmap *idmap, struct inode *old_dir,
 		if (old_dir != new_dir)
 			ufs_set_link(old_inode, dir_de, dir_folio, new_dir, 0);
 		else
-			folio_release_kmap(dir_folio, new_dir);
+			folio_release_kmap(dir_folio, dir_de);
 		inode_dec_link_count(old_dir);
 	}
 	return 0;