Skip to contentSkip to conversation

UBIFS: Missing offset relocation for compressor 'none'

PATCH New Michael Lawnick 4 participants 5 messages Mar 19, 2009 – Mar 20, 2009 UBI file system (UBIFS)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 UBIFS: Missing offset relocation for compressor 'none'

On systems where U-Boot is linked to another address than it really lays (e.g. backup image), calls via function pointers must be fixed with a '+= gd->reloc_off'.
This was not done for none_compr in ubifs_compressors_init() what leads to system crash on ubifsmount command.

---
 fs/ubifs.c |    5 +-
 1 files changed, 4 insertions(+), 1 deletions(-)
fs/ubifs/ubifs.c 2009-03-18 16:06:09.000000000 +0100 renamed from fs/ubifs/ubifs.c 2009-02-20 16:02:44.434443000 +0100 +0 -0
diff -Naur a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c

@@ -147,7 +147,10 @@ int __init ubifs_compressors_init(void)

        if (err)
                return err;
-       ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
+       err = compr_init(&none_compr);
+       if (err)
+               return err;
+
        return 0;

}
--
Kind regards,
Michael
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

#1 lore raw

PATCH v2 1/1 UBIFS: Missing offset relocation for compressor 'none'

Quoted 7 lines · Michael Lawnick

On systems where U-Boot is linked to another address than it really lays (e.g. backup image), calls via function pointers must be fixed with a '+= gd->reloc_off'.
This was not done for none_compr in ubifs_compressors_init() what leads to system crash on ubifsmount command.

Please note that I explicitly didn't fold this patch into my latest UBIFS patch series. We should apply it after UBIFS is available in mainline so that Michael will be listed as author for this fix.

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 at denx.de
=====================================================================

#2 lore raw

PATCH v2 1/1 UBIFS: Missing offset relocation for compressor 'none'

Hi Stefan,

Quoted 7 lines · Michael Lawnick
Quoted 6 lines

On systems where U-Boot is linked to another address than it really lays (e.g. backup image), calls via function pointers must be fixed with a '+= gd->reloc_off'.
This was not done for none_compr in ubifs_compressors_init() what leads to system crash on ubifsmount command.

Quoted 7 lines
Quoted 1 line

Please note that I explicitly didn't fold this patch into my latest UBIFS patch series. We should apply it after UBIFS is available in mainline so that Michael will be listed as author for this fix.

I was not so sure about this, so I was waiting for your opinion, but are you sure that it is ok to remove the assignment? Doesn't other code depend on that?

@@ -147,7 +147,10 @@ int __init ubifs_compressors_init(void)

        if (err)
                return err;
-       ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
+       err = compr_init(&none_compr);
+       if (err)
+               return err;
+
        return 0;

}

Cheers
Detlev

Signature · 8 lines
Narren sind alle, die es scheinen, und die Haelfte derer, die es nicht
scheinen ..  Jedoch ist der groesste Narr, wer es nicht zu sein glaubt
und alle andern dafuer erklaert.
                                    --- Baltasar Gracian
--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: dzu at denx.de
#3 lore raw

PATCH v2 1/1 UBIFS: Missing offset relocation for compressor 'none'

Hi Detlev,

Quoted 9 lines · Detlev Zundel
Quoted 3 lines

Please note that I explicitly didn't fold this patch into my latest UBIFS patch series. We should apply it after UBIFS is available in mainline so that Michael will be listed as author for this fix.

I was not so sure about this, so I was waiting for your opinion, but are you sure that it is ok to remove the assignment? Doesn't other code depend on that?

Review int __init ubifs_compressors_init(void) · line 155

Quoted 10 lines
(quoted diff) +4 -1
@@ -147,7 +147,10 @@ int __init ubifs_compressors_init(void)
        if (err)
                return err;
 
-       ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
+       err = compr_init(&none_compr);
+       if (err)
+               return err;
+
        return 0;
 }

Yes, I'm pretty sure this patch is correct. The removed assignment is done in compr_init() as well:

/**
* compr_init - initialize a compressor.
* @compr: compressor description object
*
* This function initializes the requested compressor and returns zero in case
* of success or a negative error code in case of failure.
*/
static int __init compr_init(struct ubifs_compressor *compr)

{
	ubifs_compressors[compr->compr_type] = compr;
	ubifs_compressors[compr->compr_type]->name += gd->reloc_off;
	ubifs_compressors[compr->compr_type]->capi_name += gd->reloc_off;
	ubifs_compressors[compr->compr_type]->decompress += gd->reloc_off;
	return 0;
}

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 at denx.de
=====================================================================

#4 lore raw

PATCH v2 1/1 UBIFS: Missing offset relocation for compressor 'none'

In reply to Michael Lawnick

Dear Michael Lawnick,

Quoted 16 lines · In message <[email protected]> you wrote:

On systems where U-Boot is linked to another address than it really lays (e.g. backup image), calls via function pointers must be fixed with a '+= gd->reloc_off'.
This was not done for none_compr in ubifs_compressors_init() what leads to system crash on ubifsmount command.

---
 fs/ubifs.c |    5 +-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff -Naur a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c

fs/ubifs/ubifs.c 2009-03-18 16:06:09.000000000 +0100 int __init ubifs_compressors_init(void) · line 155

Quoted 10 lines
fs/ubifs/ubifs.c 2009-03-18 16:06:09.000000000 +0100 renamed from fs/ubifs/ubifs.c 2009-02-20 16:02:44.434443000 +0100 +4 -1
@@ -147,7 +147,10 @@ int __init ubifs_compressors_init(void)
        if (err)
                return err;
 
-       ubifs_compressors[UBIFS_COMPR_NONE] = &none_compr;
+       err = compr_init(&none_compr);
+       if (err)
+               return err;
+
        return 0;
 }

Applied (with manual fixing) to "next" branch.

Please do not hand-edit your patches, resp. make sure to use git-send-email to submit the poatches.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Motto of the Electrical Engineer: Working computer hardware is a  lot
like an erect penis: it stays up as long as you don't fuck with it.