Signed-off-by: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com&gt; --- symbols.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/symbols.c b/symbols.c index 0cd3a01..acd8ad5 100755 --- a/symbols.c +++ b/symbols.c @@ -2995,10 +2995,10 @@ is_compressed_kernel(char *file, char **tmp) type = 0; if ((header[0] == 0x1f) && (header[1] == 0x8b) && (header[2] == 8)) { - if (!STRNEQ((char *)&header[10], "vmlinux") && + if (!STRNEQ(basename(file), "vmlinux") && !(st->flags & FORCE_DEBUGINFO)) { error(INFO, "%s: compressed file name does not " - "start with \"vmlinux\"\n", &header[10]); + "start with \"vmlinux\"\n", file); error(CONT, "Use \"-f %s\" on command line to override.\n\n", file);

Hi Dave, If a user by mistake issues the below command some junk characters are printed on the console. (crash vmlinux.gz or any .gz file) Please advise. linux:/boot # crash vmlinux-3.0.10-0.7-default.gz crash: ��{�UU����3ܣ@bjb R�I-& �� �c�"O9�Y��X^f<3��86���v1RS�q��\`������#��^����k�s@��}���=�׳d��g_�^{���Z{�����O- F�-W|y�7���f9�k���g���: compressed file name does not start with "vmlinux" Use "-f vmlinux-3.0.10-0.7-default.gz" on command line to override. crash: vmlinux-3.0.10-0.7-default.gz: not a supported file format

Aruna On Mon, 2011-12-05 at 08:28 -0500, Dave Anderson wrote: > The whole point of the "vmlinux" name check is to verify from > the compressed header itself whether it was generated from a file > that started with the name-string "vmlinux". It's not interested > in whatever the .gz creator named the compressed file. If you want > to work around that restriction, use "crash -f ...". > > Dave > > > ----- Original Message ----- > > Signed-off-by: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com&gt; > > > > --- > > symbols.c | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/symbols.c b/symbols.c > > index 0cd3a01..acd8ad5 100755 > > --- a/symbols.c > > +++ b/symbols.c > > @@ -2995,10 +2995,10 @@ is_compressed_kernel(char *file, char > > **tmp) > > type = 0; > > > > if ((header[0] == 0x1f) && (header[1] == 0x8b) && (header[2] == > > 8)) > > { > > - if (!STRNEQ((char *)&header[10], "vmlinux") && > > + if (!STRNEQ(basename(file), "vmlinux") && > > !(st->flags & FORCE_DEBUGINFO)) { > > error(INFO, "%s: compressed file name does not " > > - "start with \"vmlinux\"\n", &header[10]); > > + "start with \"vmlinux\"\n", file); > > error(CONT, > > "Use \"-f %s\" on command line to override.\n\n", > > file); > > > > >

On Mon, 2011-12-05 at 09:46 -0500, Dave Anderson wrote: > > ----- Original Message ----- > > Hi Dave, > > > > If a user by mistake issues the below command some junk characters are > > printed on the console. (crash vmlinux.gz or any .gz file) Please advise. > > > > linux:/boot # crash vmlinux-3.0.10-0.7-default.gz > > > > crash: ��{�UU����3ܣ@bjb > > R�I-& �� > > > > �c�"O9�Y��X^f<3��86���v1RS�q��\`������#��^����k�s@��}���=�׳d��g_�^{���Z{�����O- > > F�-W|y�7���f9�k���g���: compressed file name does > > not start with "vmlinux" > > Use "-f vmlinux-3.0.10-0.7-default.gz" on command line to > > override. > > > > crash: vmlinux-3.0.10-0.7-default.gz: not a supported file format > > Hmmm, I'm not sure why that's happening, although the name string in the > header does get clipped. The closest example I have on hand is this one, > where the pre-compressed filename was vmlinux-2.6.36-0.16.rc3.git0.fc15.x86_64, > and the .gz filename is vmlinux-2.6.36-0.16.rc3.git0.fc15.x86_64.gz, and > which works fine. And if I change its name to "vmlinux.gz", that still > works as expected. So I don't know how to reproduce what you are > seeing. > > Anyway, the file command shows the (possibly clipped) string in the header > that is being looked at: > > $ file vmlinux-2.6.36-0.16.rc3.git0.fc15.x86_64.gz > vmlinux-2.6.36-0.16.rc3.git0.fc15.x86_64.gz: gzip compressed data, was "vmlinux-2.6.36-0.16.rc3.git0.fc", from Unix, last modified: > Tue Oct 12 14:43:02 2010 > $ > > What does your .gz files show when you run "file" against them? > And is yours an x86_64 file? > > Dave Yeah its an x86_64 file. linux:/boot:file vmlinux-3.0.10-0.7-default.gz vmlinux-3.0.10-0.7-default.gz: gzip compressed data, from Unix, max compression

and "by mistake" i meant if a user issues crash on a .gz file without using -f option. Aruna. > > > > > > > > Aruna > > > > On Mon, 2011-12-05 at 08:28 -0500, Dave Anderson wrote: > > > The whole point of the "vmlinux" name check is to verify from > > > the compressed header itself whether it was generated from a > > > file > > > that started with the name-string "vmlinux". It's not > > > interested > > > in whatever the .gz creator named the compressed file. If you > > > want > > > to work around that restriction, use "crash -f ...". > > > > > > Dave > > > > > > > > > ----- Original Message ----- > > > > Signed-off-by: Aruna Balakrishnaiah > > > > <aruna(a)linux.vnet.ibm.com&gt; > > > > > > > > --- > > > > symbols.c | 4 ++-- > > > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/symbols.c b/symbols.c > > > > index 0cd3a01..acd8ad5 100755 > > > > --- a/symbols.c > > > > +++ b/symbols.c > > > > @@ -2995,10 +2995,10 @@ is_compressed_kernel(char *file, char > > > > **tmp) > > > > type = 0; > > > > > > > > if ((header[0] == 0x1f) && (header[1] == 0x8b) && > > > > (header[2] == > > > > 8)) > > > > { > > > > - if (!STRNEQ((char *)&header[10], "vmlinux") && > > > > + if (!STRNEQ(basename(file), "vmlinux") && > > > > !(st->flags & FORCE_DEBUGINFO)) { > > > > error(INFO, "%s: compressed file name does not " > > > > - "start with \"vmlinux\"\n", &header[10]); > > > > + "start with \"vmlinux\"\n", file); > > > > error(CONT, > > > > "Use \"-f %s\" on command line to override.\n\n", > > > > file); > > > > > > > > > > > > > > > > > >

On Tue, 2011-12-06 at 09:50 -0500, Dave Anderson wrote: > > ----- Original Message ----- > > On Mon, 2011-12-05 at 15:03 -0500, Dave Anderson wrote: > > > > > > ----- Original Message ----- > > > > > > > > So I guess the proper thing to do would be to check for the FNAME bit > > > > in the FLG byte, and if it's not set, I guess we could either accept > > > > the file without prejudice, or print a message indicating that the > > > > name has been stripped and that -f should be used. > > > > > > I wasn't aware of "gzip -n" or "gzip --no-name" when I wrote the > > > original function. How does the attached patch work for you? > > > Instead of either suggestion above, it will just print a NOTE if > > > you don't use "-f". > > > > > > Dave > > > > > Hi Dave, > > > > The attached patch works for me. It prints the file name is > > unknown. How about printing the file name is unknown and -f should be used as > > you mentioned in the previous mail. > > OK, will do -- queued for crash-6.0.2. > > Thanks > Dave > Hi Dave, A return statement is missing in the if condition when a .gz file header contains no filename. Request you to include the same. --- crash-6.0.1/symbols.c.orig +++ crash-6.0.1/symbols.c @@ -2983,6 +2983,8 @@ is_compressed_kernel(char *file, char ** #define GZIP (1) #define BZIP2 (2) +#define FNAME (1 << 3) + if ((fd = open(file, O_RDONLY)) < 0) return FALSE; @@ -2995,7 +2997,12 @@ is_compressed_kernel(char *file, char **type = 0; if ((header[0] == 0x1f) && (header[1] == 0x8b) && (header[2] == 8)) { - if (!STRNEQ((char *)&header[10], "vmlinux") && + if (!(header[3] & FNAME)) { + if (!(st->flags & FORCE_DEBUGINFO)) + error(NOTE, "%s: " + "original filename unknown\n\n", + file); return FALSE;----> to be included. + } else if (!STRNEQ((char *)&header[10], "vmlinux") && !(st->flags & FORCE_DEBUGINFO)) { error(INFO, "%s: compressed file name does not " "start with \"vmlinux\"\n", &header[10]);

Hi Dave, If a user by mistake issues the below command some junk characters are printed on the console. (crash vmlinux.gz or any .gz file) Please advise. linux:/boot # crash vmlinux-3.0.10-0.7-default.gz

crash: ��{�UU����3ܣ@bjb R�I-& �� �c�"O9�Y��X^f<3��86���v1RS�q��\`������#��^����k�s@��}���=�׳d��g_�^{���Z{�����O- F�-W|y�7���f9�k���g���: compressed file name does not start with "vmlinux" Use "-f vmlinux-3.0.10-0.7-default.gz" on command line to override. crash: vmlinux-3.0.10-0.7-default.gz: not a supported file format Aruna On Mon, 2011-12-05 at 08:28 -0500, Dave Anderson wrote: > The whole point of the "vmlinux" name check is to verify from > the compressed header itself whether it was generated from a file > that started with the name-string "vmlinux". It's not interested > in whatever the .gz creator named the compressed file. If you want > to work around that restriction, use "crash -f ...". > > Dave > > > ----- Original Message ----- > > Signed-off-by: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com&gt; > > > > --- > > symbols.c | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/symbols.c b/symbols.c > > index 0cd3a01..acd8ad5 100755 > > --- a/symbols.c > > +++ b/symbols.c > > @@ -2995,10 +2995,10 @@ is_compressed_kernel(char *file, char > > **tmp) > > type = 0; > > > > if ((header[0] == 0x1f) && (header[1] == 0x8b) && (header[2] == > > 8)) > > { > > - if (!STRNEQ((char *)&header[10], "vmlinux") && > > + if (!STRNEQ(basename(file), "vmlinux") && > > !(st->flags & FORCE_DEBUGINFO)) { > > error(INFO, "%s: compressed file name does not " > > - "start with \"vmlinux\"\n", &header[10]); > > + "start with \"vmlinux\"\n", file); > > error(CONT, > > "Use \"-f %s\" on command line to override.\n\n", > > file); > > > > >