Ocfs2: Need to initialize uuid when setuping the osb.
PATCH 1/2 Ocfs2: Need to initialize uuid when setuping the osb.
I accidently found this when adding new ioctls for ocfs2 to request fs info from none-prvileged users.
ocfs2_super osb has successfully setuped osb.uuid_str, but it did leave the osb.uuid field NULL without proper initializing and bytes filling, it should be corrected I guess.
--- fs/ocfs2/super.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
fs/ocfs2/super.c +7 -0
@@ -1920,6 +1920,12 @@ static int ocfs2_setup_osb_uuid(struct ocfs2_super *osb, const unsigned char *uuBUG_ON (uuid_bytes !=OCFS2_VOL_UUID_LEN ); + osb->uuid =kzalloc (OCFS2_VOL_UUID_LEN ,GFP_KERNEL ); +if (osb->uuid ==NULL ) +return -ENOMEM ; + +memmove (osb->uuid, uuid,OCFS2_VOL_UUID_LEN ); + osb->uuid_str =kzalloc (OCFS2_VOL_UUID_LEN *2 +1 ,GFP_KERNEL );if (osb->uuid_str ==NULL )return -ENOMEM ;
@@ -2415,6 +2421,7 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb)kfree (osb->journal);if (osb->local_alloc_copy)kfree (osb->local_alloc_copy); +kfree (osb->uuid);kfree (osb->uuid_str);ocfs2_put_dlm_debug (osb->osb_dlm_debug);memset (osb,0 ,sizeof (struct ocfs2_super ));
Signature · 1 line
1.5.5
PATCH 1/2 Ocfs2: Need to initialize uuid when setuping the osb.
Quoted 17 lines · Tristan Ye
I accidently found this when adding new ioctls for ocfs2 to request fs info from none-prvileged users.
ocfs2_superosb has successfully setuped osb.uuid_str, but it did leave the osb.uuid field NULL without proper initializing and bytes filling, it should be corrected I guess.Signed-off-by Tristan Ye <[email protected]>--- fs/ocfs2/super.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)fs/ocfs2/super.c +0
-0
fs/ocfs2/super.c static int ocfs2_setup_osb_uuid(struct ocfs2_super *osb, const unsigned char *uu · line 1928
Quoted 9 lines
fs/ocfs2/super.c +5
-0@@ -1920,6 +1920,12 @@ static int ocfs2_setup_osb_uuid(struct ocfs2_super *osb, const unsigned char *uuBUG_ON (uuid_bytes !=OCFS2_VOL_UUID_LEN ); + osb->uuid =kzalloc (OCFS2_VOL_UUID_LEN ,GFP_KERNEL ); +if (osb->uuid ==NULL ) +return -ENOMEM ; + +memmove (osb->uuid, uuid,OCFS2_VOL_UUID_LEN );
memmove() is an overkill when we know the areas do not overlap. Use memcpy().
fs/ocfs2/super.c static void ocfs2_delete_osb(struct ocfs2_super *osb) · line 2427
Quoted 13 lines
fs/ocfs2/super.c +1
-0+ osb->uuid_str =kzalloc (OCFS2_VOL_UUID_LEN *2 +1 ,GFP_KERNEL );if (osb->uuid_str ==NULL )fs/ocfs2/super.c +1
-0return -ENOMEM ;@@ -2415,6 +2421,7 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb)kfree (osb->journal);if (osb->local_alloc_copy)kfree (osb->local_alloc_copy); +kfree (osb->uuid);kfree (osb->uuid_str);ocfs2_put_dlm_debug (osb->osb_dlm_debug);memset (osb,0 ,sizeof (struct ocfs2_super ));
So we only use the string representation of the uuid. So I see no use of this. Maybe we should just remove osb->uuid.
PATCH 1/2 Ocfs2: Need to initialize uuid when setuping the osb.
Quoted 40 lines · Sunil Mushran
Quoted 19 lines · Tristan Ye
I accidently found this when adding new ioctls for ocfs2 to request fs info from none-prvileged users.
ocfs2_superosb has successfully setuped osb.uuid_str, but it did leave the osb.uuid field NULL without proper initializing and bytes filling, it should be corrected I guess.Signed-off-by Tristan Ye <[email protected]>---
fs/ocfs2/super.c| 7 +++++++1 files changed, 7 insertions(+), 0 deletions(-)fs/ocfs2/super.c +0
-0@@ -1920,6 +1920,12 @@ static int ocfs2_setup_osb_uuid(struct
ocfs2_super*osb, const unsigned char *uuQuoted 7 lines
BUG_ON(uuid_bytes != OCFS2_VOL_UUID_LEN);+
osb->uuid=kzalloc(OCFS2_VOL_UUID_LEN, GFP_KERNEL);
+ if (osb->uuid== NULL)
+ return-ENOMEM;
+
+memmove(osb->uuid, uuid, OCFS2_VOL_UUID_LEN);
memmove()is an overkill when we know the areas do not overlap. Usememcpy().Quoted 9 lines
+
osb->uuid_str=kzalloc(OCFS2_VOL_UUID_LEN * 2 + 1, GFP_KERNEL); if (osb->uuid_str== NULL)
return-ENOMEM;fs/ocfs2/super.c +0
-0@@ -2415,6 +2421,7 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb)kfree (osb->journal);if (osb->local_alloc_copy)kfree (osb->local_alloc_copy);
Quoted 8 lines
Quoted 4 lines
fs/ocfs2/super.c +1
-0+kfree (osb->uuid);kfree (osb->uuid_str);ocfs2_put_dlm_debug (osb->osb_dlm_debug);
memset(osb, 0, sizeof(struct ocfs2_super));So we only use the string representation of the uuid. So I see no use of this. Maybe we should just remove
osb->uuid.
uuid field only takes up 16 bytes, while uuid_str needs 32 bytes...
why not just remove uuid_str instead?
Tristan
PATCH 1/2 Ocfs2: Need to initialize uuid when setuping the osb.
Hi tristan,
Quoted 48 lines · Tristan
Quoted 30 lines · Sunil Mushran
Quoted 19 lines · Tristan Ye
I accidently found this when adding new ioctls for ocfs2 to request fs info from none-prvileged users.
ocfs2_superosb has successfully setuped osb.uuid_str, but it did leave the osb.uuid field NULL without proper initializing and bytes filling, it should be corrected I guess.Signed-off-by Tristan Ye <[email protected]>---
fs/ocfs2/super.c| 7 +++++++1 files changed, 7 insertions(+), 0 deletions(-)fs/ocfs2/super.c +0
-0@@ -1920,6 +1920,12 @@ static int ocfs2_setup_osb_uuid(struct
ocfs2_super*osb, const unsigned char *uuQuoted 7 lines
BUG_ON(uuid_bytes != OCFS2_VOL_UUID_LEN);+
osb->uuid=kzalloc(OCFS2_VOL_UUID_LEN, GFP_KERNEL);
+ if (osb->uuid== NULL)
+ return-ENOMEM;
+
+memmove(osb->uuid, uuid, OCFS2_VOL_UUID_LEN);
memmove()is an overkill when we know the areas do not overlap. Usememcpy().Quoted 16 lines
Quoted 12 lines
+
osb->uuid_str=kzalloc(OCFS2_VOL_UUID_LEN * 2 + 1, GFP_KERNEL); if (osb->uuid_str== NULL)
return-ENOMEM;fs/ocfs2/super.c +1
-0@@ -2415,6 +2421,7 @@ static void ocfs2_delete_osb(struct ocfs2_super *osb)kfree (osb->journal);if (osb->local_alloc_copy)kfree (osb->local_alloc_copy); +kfree (osb->uuid);kfree (osb->uuid_str);ocfs2_put_dlm_debug (osb->osb_dlm_debug);Quoted 1 line
memset(osb, 0, sizeof(struct ocfs2_super));So we only use the string representation of the uuid. So I see no use of this. Maybe we should just remove
osb->uuid.
Quoted 3 lines
uuid field only takes up 16 bytes, while
uuid_strneeds 32 bytes...why not just remove
uuid_strinstead?
There are many functions which use uuid_str.
One good example is debug_create_dir(It is a debugfs function, so we'd better not change it). This function needs a char * for the name of the created dir. So uuid is no use here and we have to convert uuid to uuid_str.
So I agree with Sunil that we can remove uuid if there is no user for it.
Regards,
Tao