lkml.org 
[lkml]   [2002]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patches in this message
/
Date
From
Subject[PATCH] correction to super_block cleanups
I forgot to zero out the newly allocated memory in the previous patches. 
First patch is for the changes included in 2.5.7-pre1, second is
incremental to the ext2 and ncp patches.

--

Brian Gerst
diff -ruN linux/fs/cramfs/inode.c linux2/fs/cramfs/inode.c
--- linux/fs/cramfs/inode.c Tue Mar 12 17:35:10 2002
+++ linux2/fs/cramfs/inode.c Tue Mar 12 20:01:37 2002
@@ -201,6 +201,7 @@
if (!sbi)
return -ENOMEM;
sb->u.generic_sbp = sbi;
+ memset(sbi, 0, sizeof(struct cramfs_sb_info));

sb_set_blocksize(sb, PAGE_CACHE_SIZE);

diff -ruN linux/fs/minix/inode.c linux2/fs/minix/inode.c
--- linux/fs/minix/inode.c Tue Mar 12 17:35:10 2002
+++ linux2/fs/minix/inode.c Tue Mar 12 20:01:10 2002
@@ -178,6 +178,7 @@
if (!sbi)
return -ENOMEM;
s->u.generic_sbp = sbi;
+ memset(sbi, 0, sizeof(struct minix_sb_info));

/* N.B. These should be compile-time tests.
Unfortunately that is impossible. */diff -ruN linux/fs/ext2/super.c linux2/fs/ext2/super.c
--- linux/fs/ext2/super.c Tue Mar 12 19:59:57 2002
+++ linux2/fs/ext2/super.c Tue Mar 12 20:03:16 2002
@@ -469,6 +469,7 @@
if (!sbi)
return -ENOMEM;
sb->u.generic_sbp = sbi;
+ memset(sbi, 0, sizeof(struct ext2_super_block));

/*
* See what the current blocksize for the device is, and
diff -ruN linux/fs/ncpfs/inode.c linux2/fs/ncpfs/inode.c
--- linux/fs/ncpfs/inode.c Tue Mar 12 19:59:51 2002
+++ linux2/fs/ncpfs/inode.c Tue Mar 12 20:04:09 2002
@@ -319,6 +319,8 @@
if (!server)
return -ENOMEM;
sb->u.generic_sbp = server;
+ memset(server, 0, sizeof(struct ncp_server));
+
error = -EFAULT;
if (raw_data == NULL)
goto out;
\
 
 \ /
  Last update: 2005-03-22 13:24    [W:0.052 / U:0.456 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site