Possible NULL pointer dereference in fs/configfs/dir.c
PATCH 1/1 Possible NULL pointer dereference in fs/configfs/dir.c
hi,
this fixes coverity bug #845, if group is NULL,
we dereference it when setting up dentry.
fs/configfs/dir.c renamed from fs/configfs/dir.c.orig +3 -1
@@ -500,7 +500,7 @@ static int create_default_group(struct cstatic int populate_groups (struct config_group *group) {struct config_group *new_group; -struct dentry *dentry = group->cg_item.ci_dentry; +struct dentry *dentry;int ret =0 ;int i;
@@ -512,6 +512,8 @@ static int populate_groups(struct config* parent to find us, let alone mess with our tree. * That said, taking our i_mutex is closer to mkdir * emulation, and shouldn't hurt. */ + dentry = group->cg_item.ci_dentry; +mutex_lock (&dentry->d_inode->i_mutex);for (i =0 ; group->default_groups[i]; i++) {
Quoted 2 lines · Eric Sesterhenn
this fixes coverity bug #845, if group is NULL,
we dereference it when setting up dentry.
Is the converity checker merly looking at in-function patterns?
Where can I access the bug report (sorry for the question).
group cannot be null here, we aren't called any other way. So
while you are correct that the code below is needed in the presence of a NULL group, really the "if (group" isn't necessary, just the "if (group->default_groups)". I could even BUG_ON() if you'd like.
Joel
Quoted 25 lines
Signed-off-by Eric Sesterhenn <[email protected]>fs/configfs/dir.c renamed from fs/configfs/dir.c.orig +3
-1@@ -500,7 +500,7 @@ static int create_default_group(struct cstatic int populate_groups (struct config_group *group) {struct config_group *new_group; -struct dentry *dentry = group->cg_item.ci_dentry; +struct dentry *dentry;int ret =0 ;int i;@@ -512,6 +512,8 @@ static int populate_groups(struct config* parent to find us, let alone mess with our tree. * That said, taking our i_mutex is closer to mkdir * emulation, and shouldn't hurt. */ + dentry = group->cg_item.ci_dentry; +mutex_lock (&dentry->d_inode->i_mutex);for (i =0 ; group->default_groups[i]; i++) {
Signature · 8 lines
"Win95 file and print sharing are for relatively friendly nets." - Paul Leach, Microsoft Joel Becker Principal Software Developer Oracle E-mail: [email protected] Phone: (650) 506-8127
hi,
Quoted 5 lines · Joel Becker
Quoted 2 lines · Eric Sesterhenn
this fixes coverity bug #845, if group is NULL,
we dereference it when setting up dentry.Is the converity checker merly looking at in-function patterns?
afaik it also looks what the functions which get called do. If you call a function that might free a pointer you pass, it warns if you use it afterwards.
Quoted 1 line
Where can I access the bug report (sorry for the question).
I would guess [email protected]
Quoted 4 lines
group cannot be null here, we aren't called any other way. So
while you are correct that the code below is needed in the presence of a NULL group, really the "if (group" isn't necessary, just the "if (group->default_groups)". I could evenBUG_ON()if you'd like.
I would then propose the following patch, so the check can be removed for people who like small kernels. I dont think gcc notices that all callers use non-NULL values and optimizes it away.
fs/configfs/dir.c renamed from fs/configfs/dir.c.orig +3 -1
@@ -504,7 +504,9 @@ static int populate_groups(struct configint ret =0 ;int i; -if (group && group->default_groups) { +BUG_ON (!group);/* group == NULL is not allowed */ + +if (group->default_groups) {/* FYI, we're faking mkdir here * I'm not sure we need this semaphore, as we're called * from our parent's mkdir. That holds our parent's
fs/configfs/dir.c static int populate_groups(struct config · line 509
Quoted 8 lines · Eric Sesterhenn
I would then propose the following patch, so the check can be removed for people who like small kernels. I dont think gcc notices that all callers use non-NULL values and optimizes it away.
fs/configfs/dir.c renamed from fs/configfs/dir.c.orig +3
-1-if (group && group->default_groups) { +BUG_ON (!group);/* group == NULL is not allowed */ + +if (group->default_groups) {
This is pretty much what I meant. Thanks.
Joel
Signature · 9 lines
Life's Little Instruction Book #3 "Watch a sunrise at least once a year." Joel Becker Principal Software Developer Oracle E-mail: [email protected] Phone: (650) 506-8127
Quoted 15 lines · Eric Sesterhenn
...
On Wed, 2006-03-22 at 15:27 -0800, Joel Becker wrote:
...Quoted 4 lines
group cannot be null here, we aren't called any other way. So
while you are correct that the code below is needed in the presence of a NULL group, really the "if (group" isn't necessary, just the "if (group->default_groups)". I could evenBUG_ON()if you'd like.I would then propose the following patch, so the check can be removed for people who like small kernels. I dont think gcc notices that all callers use non-NULL values and optimizes it away.
fs/configfs/dir.c static int populate_groups(struct config · line 509
Quoted 8 lines
fs/configfs/dir.c renamed from fs/configfs/dir.c.orig +3
-1@@ -504,7 +504,9 @@ static int populate_groups(struct configint ret =0 ;int i; -if (group && group->default_groups) { +BUG_ON (!group);/* group == NULL is not allowed */ + +if (group->default_groups) {
Why do we need a BUG_ON() if we already got an Oops? Simply remove the check.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedQuoted 10 lines · Joel Becker
Quoted 2 lines · Eric Sesterhenn
this fixes coverity bug #845, if group is NULL,
we dereference it when setting up dentry.Is the converity checker merly looking at in-function patterns?
Where can I access the bug report (sorry for the question).
group cannot be null here, we aren't called any other way. So
while you are correct that the code below is needed in the presence of a NULL group, really the "if (group" isn't necessary, just the "if (group->default_groups)". I could evenBUG_ON()if you'd like.
Coverity is correct that something is wrong:
<-- snip -->
...
struct dentry *dentry = group->cg_item.ci_dentry;
int ret = 0;
int i;
if (group && group->default_groups) {...
<-- snip -->
The question is only whether the dereferencing is a real bug or there's only the harmless issue of a superfluous check.
Quoted 1 line
Joel
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed