Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

\n

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEq1nRK9aeMoq1VSgcnJ2qBz9kQNkFAmc/WPcACgkQnJ2qBz9k
 QNkRXwgAlN2gbf1O2Df3NFl7CXt5jXhlvQ9UdA77F/j1YFL90kieVrHvQY1yManO
 +Z36nwWPTaigR7COuF9oFpCZsp6H1YY8yeqlATE+kZBFqSFQjFP8jpgZ/1JObs0M
 C2DeNibrhYm81FJhnetXyTnXifUv20Fa7xwHv5ULtZjPF0MY6ry4zqy+t4fE68Uq
 OhGyjwrTW2k1Dv36Nx6CAt3KOWvM5KPHVBpMu2frSRwNB7XBEfmfeCjqISjYccPl
 WzHsEQof7Re14GZOa9M6G/efLdXAiwFJF/w2BFCqcijLpjbBrHheEH8N9WBWoATd
 wJLt94PRTK2uJqc3jQ3tANR3gQO9Xg==
 =XneM
 -----END PGP SIGNATURE-----

Merge tag 'for_v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull quota and isofs updates from Jan Kara:
 "Fix a memory leak in isofs and a cleanup of includes in quota"

* tag 'for_v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  dquot.c: get rid of include ../internal.h
  isofs: avoid memory leak in iocharset
This commit is contained in:
Linus Torvalds 2024-11-21 09:47:44 -08:00
commit 597861d6cd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/isofs/inode.c
View File

@ -948,8 +948,6 @@ root_found:
goto out_no_inode; goto out_no_inode;
} }
kfree(opt->iocharset);
return 0; return 0;
/* /*
@ -987,7 +985,6 @@ out_freebh:
brelse(bh); brelse(bh);
brelse(pri_bh); brelse(pri_bh);
out_freesbi: out_freesbi:
kfree(opt->iocharset);
kfree(sbi); kfree(sbi);
s->s_fs_info = NULL; s->s_fs_info = NULL;
return error; return error;
@ -1528,7 +1525,10 @@ static int isofs_get_tree(struct fs_context *fc)
static void isofs_free_fc(struct fs_context *fc) static void isofs_free_fc(struct fs_context *fc)
{ {
kfree(fc->fs_private); struct isofs_options *opt = fc->fs_private;
kfree(opt->iocharset);
kfree(opt);
} }
static const struct fs_context_operations isofs_context_ops = { static const struct fs_context_operations isofs_context_ops = {

1
fs/quota/dquot.c
View File

@ -80,7 +80,6 @@
#include <linux/quotaops.h> #include <linux/quotaops.h>
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/sched/mm.h> #include <linux/sched/mm.h>
#include "../internal.h" /* ugh */
#include <linux/uaccess.h> #include <linux/uaccess.h>