Fix udev_volume_id for reiserfs v3.5
Hi Kay,
the attached patch fixes udev_volume_id for old reiserfs volumes.
How are we supposed to handle old/invalid labels?
The one I'm reading here is
eb 4d 72 17 06 4e 72 17 09 4e 72 17 53 4e 72 17
which is clearly bogus. I'll check with our fs-gurus but I think we should filter them out in udev_volume_id.
Can't we test for isascii(rs->label[0]) ?
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke [email protected] SuSE Linux AG S390 & zSeries Maxfeldstraße 5 +49 911 74053 688 90409 Nürnberg http://www.suse.de
===== extras/volume_id/volume_id/reiserfs.c 1.7 vs edited =====
extras/volume_id/volume_id/reiserfs.c +4 -0
@@ -80,6 +80,10 @@return -1 ; rs = (struct reiserfs_super_block *) buf;; +if (memcmp (rs->magic,"ReIsErFs" ,9 ) ==0 ) { +strcpy (id->type_version,"3.5" ); + goto found_v3; + }if (memcmp (rs->magic,"ReIsEr2Fs" ,9 ) ==0 ) {strcpy (id->type_version,"3.6" ); goto found_v3;
Quoted 1 line · Hannes Reinecke
the attached patch fixes
udev_volume_idfor old reiserfs volumes.
The signature for that version can be at the offset of the later versions? We already check for that signature at a different offset.
Quoted 6 lines
How are we supposed to handle old/invalid labels?
The one I'm reading here is
eb 4d 72 17 06 4e 72 17 09 4e 72 17 53 4e 72 17
which is clearly bogus. I'll check with our fs-gurus but I think we should filter them out inudev_volume_id.
Can't we test forisascii(rs->label[0])?
If that helps, sure. But what if the garbage starts at the second char? And what's with the UTF8 char sequences?
extras/volume_id/volume_id/reiserfs.c line 83
Quoted 7 lines
===
extras/volume_id/volume_id/reiserfs.c1.7 vs edited ==> ---1.7/extras/volume_id/volume_id/reiserfs.c2005-03-09 16:58:00 +01:00
+++edited/extras/volume_id/volume_id/reiserfs.c2005-03-15 13:31:53 +01:00extras/volume_id/volume_id/reiserfs.c +1
-0@@ -80,6 +80,10 @@return -1 ; rs = (struct reiserfs_super_block *) buf;; +if (memcmp (rs->magic,"ReIsErFs" ,9 ) =0 ) {
Do we need to compare the trailing '\0'?
extras/volume_id/volume_id/reiserfs.c line 89
Quoted 6 lines
extras/volume_id/volume_id/reiserfs.c +3
-0+strcpy (id->type_version,"3.5" ); + goto found_v3; + }if (memcmp (rs->magic,"ReIsEr2Fs" ,9 ) =0 ) {strcpy (id->type_version,"3.6" ); goto found_v3;
Thanks,
Kay
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_ide95&alloc_id396&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel
Quoted 6 lines · Kay Sievers
Quoted 1 line · Hannes Reinecke
the attached patch fixes
udev_volume_idfor old reiserfs volumes.The signature for that version can be at the offset of the later versions? We already check for that signature at a different offset.
Appearently so.
Quoted 10 lines
Quoted 6 lines
How are we supposed to handle old/invalid labels?
The one I'm reading here is
eb 4d 72 17 06 4e 72 17 09 4e 72 17 53 4e 72 17
which is clearly bogus. I'll check with our fs-gurus but I think we should filter them out inudev_volume_id.
Can't we test forisascii(rs->label[0])?If that helps, sure. But what if the garbage starts at the second char? And what's with the UTF8 char sequences?
Well, I just asked our resident reiserfs guru (thx mason :-). Reiser v3.5 does not support labels nor uuids. Corrected patch attached.
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke [email protected] SuSE Linux AG S390 & zSeries Maxfeldstraße 5 +49 911 74053 688 90409 Nürnberg http://www.suse.de
===== extras/volume_id/volume_id/reiserfs.c 1.7 vs edited =====
extras/volume_id/volume_id/reiserfs.c +5 -1
@@ -80,6 +80,10 @@return -1 ; rs = (struct reiserfs_super_block *) buf;; +if (memcmp (rs->magic,"ReIsErFs" ,8 ) ==0 ) { +strcpy (id->type_version,"3.5" ); + goto found; + }if (memcmp (rs->magic,"ReIsEr2Fs" ,9 ) ==0 ) {strcpy (id->type_version,"3.6" ); goto found_v3;
@@ -104,7 +108,7 @@if (memcmp (rs->magic,"ReIsErFs" ,8 ) ==0 ) {strcpy (id->type_version,"3.5" ); - goto found_v3; + goto found; }return -1 ;
Quoted 16 lines · Hannes Reinecke
Quoted 6 lines · Kay Sievers
Quoted 1 line · Hannes Reinecke
the attached patch fixes
udev_volume_idfor old reiserfs volumes.The signature for that version can be at the offset of the later versions? We already check for that signature at a different offset.
Appearently so.
Quoted 7 lines
Quoted 6 lines
How are we supposed to handle old/invalid labels?
The one I'm reading here is
eb 4d 72 17 06 4e 72 17 09 4e 72 17 53 4e 72 17
which is clearly bogus. I'll check with our fs-gurus but I think we should filter them out inudev_volume_id.
Can't we test forisascii(rs->label[0])?
Quoted 6 lines
Quoted 3 lines
If that helps, sure. But what if the garbage starts at the second char? And what's with the UTF8 char sequences?
Well, I just asked our resident reiserfs guru (thx mason :-). Reiser v3.5 does not support labels nor uuids. Corrected patch attached.
Nice! Applied, thanks.
Kay
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_ide95&alloc_id396&op=click
_______________________________________________
Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel