linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 2edc8f933d 344044d8c9
commit 597861d6cd
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/isofs/inode.c
+4 -4
View File
@@ -948,8 +948,6 @@ root_found:
goto out_no_inode;
}
kfree(opt->iocharset);
return 0;
/*
@@ -987,7 +985,6 @@ out_freebh:
brelse(bh);
brelse(pri_bh);
out_freesbi:
kfree(opt->iocharset);
kfree(sbi);
s->s_fs_info = NULL;
return error;
@@ -1528,7 +1525,10 @@ static int isofs_get_tree(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 = {
fs/quota/dquot.c
-1
View File
@@ -80,7 +80,6 @@
#include <linux/quotaops.h>
#include <linux/blkdev.h>
#include <linux/sched/mm.h>
#include "../internal.h" /* ugh */
#include <linux/uaccess.h>