[U-Boot] [PATCH 1/2] ubifs: BUG realpath string must be ended with ZERO
If the memory used to copy the link_make is "dirty" the string wont be ended with Zero, throwing out multiple memory bugs.
Signed-off-by: Ricardo Ribalda Delgado ricardo.ribalda@uam.es --- v2: better doc and remove duplicated memcpy
fs/ubifs/ubifs.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 32f9ff8..3c8b5da 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -641,6 +641,7 @@ int ubifs_load(char *filename, u32 addr, u32 size) ui = ubifs_inode(inode); if (((inode->i_mode & S_IFMT) == S_IFLNK) && ui->data_len) { memcpy(link_name, ui->data, ui->data_len); + link_name[ui->data_len]='\0'; printf("%s is linked to %s!\n", filename, link_name); ubifs_iput(inode);
Blocks compressed with zlib dont have the full gzip header.
This patch adds a new function to properly handle blocks compressed with zlib.
Without this patch, block compressed with zlib cannot be readed!
Signed-off-by: Ricardo Ribalda Delgado ricardo.ribalda@uam.es --- v2: remove unused parts.. fs/ubifs/ubifs.c | 36 +++++++++++++++++++++++++++++++++++- fs/ubifs/ubifs.h | 2 -- 2 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 3c8b5da..44bf651 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -24,6 +24,7 @@ */
#include "ubifs.h" +#include <u-boot/zlib.h>
#if !defined(CONFIG_SYS_64BIT_VSPRINTF) #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output! @@ -33,6 +34,10 @@ DECLARE_GLOBAL_DATA_PTR;
/* compress.c */
+int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); +void *zalloc(void *, unsigned, unsigned); +void zfree(void *, void *, unsigned); + /* * We need a wrapper for gunzip() because the parameters are * incompatible with the lzo decompressor. @@ -41,7 +46,7 @@ static int gzip_decompress(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { unsigned long len = in_len; - return gunzip(out, *out_len, (unsigned char *)in, &len); + return ubi_gunzip(out, *out_len, (unsigned char *)in, &len); }
/* Fake description object for the "none" compressor */ @@ -686,3 +691,32 @@ out: ubi_close_volume(c->ubi); return err; } + +int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) +{ + z_stream s; + int r, flags; + + s.zalloc = zalloc; + s.zfree = zfree; +#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG) + s.outcb = (cb_func)WATCHDOG_RESET; +#else + s.outcb = Z_NULL; +#endif /* CONFIG_HW_WATCHDOG */ + + r = inflateInit2(&s, -MAX_WBITS); + if (r != Z_OK) { + printf ("Error: inflateInit2() returned %d\n", r); + return (-1); + } + s.next_in = src; + s.avail_in = *lenp; + s.next_out = dst; + s.avail_out = dstlen; + r = inflate(&s, Z_FINISH); + *lenp = s.next_out - (unsigned char *) dst; + inflateEnd(&s); + + return (0); +} diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 91351de..a68e4c1 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -2172,6 +2172,4 @@ int ubifs_decompress(const void *buf, int len, void *out, int *out_len, /* todo: Move these to a common U-Boot header */ int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len); -int gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); - #endif /* !__UBIFS_H__ */
On Friday 24 April 2009, Ricardo Ribalda Delgado wrote:
Blocks compressed with zlib dont have the full gzip header.
This patch adds a new function to properly handle blocks compressed with zlib.
Without this patch, block compressed with zlib cannot be readed!
Signed-off-by: Ricardo Ribalda Delgado ricardo.ribalda@uam.es
Looks better. Below some mostly nitpicking comments.
v2: remove unused parts.. fs/ubifs/ubifs.c | 36 +++++++++++++++++++++++++++++++++++- fs/ubifs/ubifs.h | 2 -- 2 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 3c8b5da..44bf651 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -24,6 +24,7 @@ */
#include "ubifs.h" +#include <u-boot/zlib.h>
#if !defined(CONFIG_SYS_64BIT_VSPRINTF) #warning Please define CONFIG_SYS_64BIT_VSPRINTF for correct output! @@ -33,6 +34,10 @@ DECLARE_GLOBAL_DATA_PTR;
/* compress.c */
+int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp); +void *zalloc(void *, unsigned, unsigned); +void zfree(void *, void *, unsigned);
Please move those prototypes to the header instead (ubifs.h).
/*
- We need a wrapper for gunzip() because the parameters are
- incompatible with the lzo decompressor.
@@ -41,7 +46,7 @@ static int gzip_decompress(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { unsigned long len = in_len;
- return gunzip(out, *out_len, (unsigned char *)in, &len);
- return ubi_gunzip(out, *out_len, (unsigned char *)in, &len);
}
/* Fake description object for the "none" compressor */ @@ -686,3 +691,32 @@ out: ubi_close_volume(c->ubi); return err; }
+int ubi_gunzip(void *dst, int dstlen, unsigned char *src, unsigned long *lenp) +{
- z_stream s;
- int r, flags;
- s.zalloc = zalloc;
- s.zfree = zfree;
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
- s.outcb = (cb_func)WATCHDOG_RESET;
+#else
- s.outcb = Z_NULL;
+#endif /* CONFIG_HW_WATCHDOG */
- r = inflateInit2(&s, -MAX_WBITS);
- if (r != Z_OK) {
printf ("Error: inflateInit2() returned %d\n", r);return (-1);
return is not a function. So just use:
return -1;
- }
- s.next_in = src;
- s.avail_in = *lenp;
- s.next_out = dst;
- s.avail_out = dstlen;
- r = inflate(&s, Z_FINISH);
- *lenp = s.next_out - (unsigned char *) dst;
- inflateEnd(&s);
- return (0);
Again, please "return 0;" here.
Thanks.
Best regards, Stefan
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de =====================================================================
On Friday 24 April 2009 10:36:06 Ricardo Ribalda Delgado wrote:
Blocks compressed with zlib dont have the full gzip header.
This patch adds a new function to properly handle blocks compressed with zlib.
Without this patch, block compressed with zlib cannot be readed!
this really should be a common function not specific to ubifs as there are many other opportunities for things to be compressed directly with zlib and not through gzip (splash/video images come to mind). -mike
Hello Mike:
Who is in charge of the lib_generic stuff?
Meanwhile there is no such a function I will leave it as an extra function. This must be solved ASAP, it is a simply bug that avoid many fs to be mounted properly.
Best regards
On Mon, Apr 27, 2009 at 08:59, Mike Frysinger vapier@gentoo.org wrote:
On Friday 24 April 2009 10:36:06 Ricardo Ribalda Delgado wrote:
Blocks compressed with zlib dont have the full gzip header.
This patch adds a new function to properly handle blocks compressed with zlib.
Without this patch, block compressed with zlib cannot be readed!
this really should be a common function not specific to ubifs as there are many other opportunities for things to be compressed directly with zlib and not through gzip (splash/video images come to mind). -mike
On Monday 27 April 2009 03:06:26 Ricardo Ribalda Delgado wrote:
fix your top posting. which is to say dont.
Who is in charge of the lib_generic stuff?
if there is no one specified in the MAINTAINERS file, then Wolfgang maintains it all. just send it to the u-boot list and someone will pick it up.
Meanwhile there is no such a function I will leave it as an extra function. This must be solved ASAP, it is a simply bug that avoid many fs to be mounted properly.
by the by, your definition of "ASAP" rarely lines up with anyone else's. you already have a fix so your "ASAP" is taken care of. -mike
On Monday 27 April 2009, Mike Frysinger wrote:
Who is in charge of the lib_generic stuff?
if there is no one specified in the MAINTAINERS file, then Wolfgang maintains it all. just send it to the u-boot list and someone will pick it up.
Yes, Wolfgang is ion charge for all this stuff.
Meanwhile there is no such a function I will leave it as an extra function. This must be solved ASAP, it is a simply bug that avoid many fs to be mounted properly.
We should really fix this properly, as Mike suggested, by moving this function into a common/generic file. It shouldn't be a problem to get it accepted in this release since it's a bug fix. So please resubmit again, this time in lib_generic.
Thanks.
Best regards, Stefan
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de =====================================================================
Hello
I am creating a new function (zunzip). Where this function should be placed. In zlib.c or in gunzip.c?
Best regards
On Mon, Apr 27, 2009 at 09:36, Stefan Roese sr@denx.de wrote:
On Monday 27 April 2009, Mike Frysinger wrote:
Who is in charge of the lib_generic stuff?
if there is no one specified in the MAINTAINERS file, then Wolfgang maintains it all. just send it to the u-boot list and someone will pick it up.
Yes, Wolfgang is ion charge for all this stuff.
Meanwhile there is no such a function I will leave it as an extra function. This must be solved ASAP, it is a simply bug that avoid many fs to be mounted properly.
We should really fix this properly, as Mike suggested, by moving this function into a common/generic file. It shouldn't be a problem to get it accepted in this release since it's a bug fix. So please resubmit again, this time in lib_generic.
Thanks.
Best regards, Stefan
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office@denx.de =====================================================================
On Monday 27 April 2009 03:48:15 Ricardo Ribalda Delgado wrote:
Hello
you're still top posting. please fix the e-mail composer.
I am creating a new function (zunzip). Where this function should be placed. In zlib.c or in gunzip.c?
probably the latter since the former is more "code straight from zlib" -mike
On Friday 24 April 2009 10:36:05 Ricardo Ribalda Delgado wrote:
If the memory used to copy the link_make is "dirty" the string wont be ended with Zero, throwing out multiple memory bugs.
use "NULL" or "NUL", not "Zero". same goes for subject.
link_name[ui->data_len]='\0';
need spaces around the equal sign. -mike
participants (3)
-
Mike Frysinger -
Ricardo Ribalda Delgado -
Stefan Roese