[gentoo-hardened] removing .text relocations from mplayer and xine-lib

[gentoo-hardened] removing .text relocations from mplayer and xine-lib

[René Rhéaume]

Where is the patch that removes .text relocations from mplayer and
xine-lib? Solar said on IRC that was one lying around somewhere. I
searched on Gentoo Bugzilla and on the Web with Google and I did not
find it.

Why? This is what I get from /usr/bin/xine (part of xine-ui)
This is xine (X11 gui) - a free video player v0.99.3.
(c) 2000-2004 The xine Team.
Can't modify /usr/lib/xine/plugins/1.0.0/post/xineplug_post_planar.so's 
text section. Use GCC option -fPIC for shared objects, please.

Hmm, there is already a PIC patch applied to xine-lib.

-- 
gentoo-hardened@gentoo.org mailing list

Re: [gentoo-hardened] removing .text relocations from mplayer and xine-lib

[Ned Ludd]

[-- Attachment #1: Type: text/plain, Size: 966 bytes --]

On Sun, 2005-05-29 at 11:27 -0400, René Rhéaume wrote:
> Where is the patch that removes .text relocations from mplayer and
> xine-lib? Solar said on IRC that was one lying around somewhere. I
> searched on Gentoo Bugzilla and on the Web with Google and I did not
> find it.

I could not find where I put it and your the second person to
ask/request it today so I did another. 

See attached untested patch for mplayer..

It may be easier to just have them do 
#if (defined (__PIC__) && !defined(PIC))
# define PIC __PIC__
#endif

> Why? This is what I get from /usr/bin/xine (part of xine-ui)
> This is xine (X11 gui) - a free video player v0.99.3.
> (c) 2000-2004 The xine Team.
> Can't modify /usr/lib/xine/plugins/1.0.0/post/xineplug_post_planar.so's 
> text section. Use GCC option -fPIC for shared objects, please.
> 
> Hmm, there is already a PIC patch applied to xine-lib.

It's probably not complete like mplayer was not. 


-- 
Ned Ludd <solar@gentoo.org>

[-- Attachment #2: MPlayer-1.0pre7-more-pic-updates.patch --]
[-- Type: text/x-patch, Size: 7885 bytes --]

diff -Nrup MPlayer-1.0pre7.unpacked/libavcodec/common.h MPlayer-1.0pre7/libavcodec/common.h
--- MPlayer-1.0pre7.unpacked/libavcodec/common.h	2005-04-16 16:41:13.000000000 -0400
+++ MPlayer-1.0pre7/libavcodec/common.h	2005-05-29 13:05:40.000000000 -0400
@@ -219,13 +219,13 @@ static inline float floorf(float f) { 
 // Use rip-relative addressing if compiling PIC code on x86-64.
 #    if defined(__MINGW32__) || defined(__CYGWIN__) || \
         defined(__OS2__) || (defined (__OpenBSD__) && !defined(__ELF__))
-#        if defined(ARCH_X86_64) && defined(PIC)
+#        if defined(ARCH_X86_64) && defined(__PIC__)
 #            define MANGLE(a) "_" #a"(%%rip)"
 #        else
 #            define MANGLE(a) "_" #a
 #        endif
 #    else
-#        if defined(ARCH_X86_64) && defined(PIC)
+#        if defined(ARCH_X86_64) && defined(__PIC__)
 #            define MANGLE(a) #a"(%%rip)"
 #        else
 #            define MANGLE(a) #a
diff -Nrup MPlayer-1.0pre7.unpacked/libavcodec/i386/dsputil_mmx.c MPlayer-1.0pre7/libavcodec/i386/dsputil_mmx.c
--- MPlayer-1.0pre7.unpacked/libavcodec/i386/dsputil_mmx.c	2005-04-16 16:41:13.000000000 -0400
+++ MPlayer-1.0pre7/libavcodec/i386/dsputil_mmx.c	2005-05-29 13:01:39.000000000 -0400
@@ -59,7 +59,7 @@ static const uint64_t ff_pb_FC attribute
     "pcmpeqd %%" #regd ", %%" #regd " \n\t"\
     "paddb %%" #regd ", %%" #regd " \n\t" ::)
 
-#ifndef PIC
+#ifndef __PIC__
 #define MOVQ_BONE(regd)  __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_bone))
 #define MOVQ_WTWO(regd)  __asm __volatile ("movq %0, %%" #regd " \n\t" ::"m"(mm_wtwo))
 #else
diff -Nrup MPlayer-1.0pre7.unpacked/libavcodec/i386/dsputil_mmx_avg.h MPlayer-1.0pre7/libavcodec/i386/dsputil_mmx_avg.h
--- MPlayer-1.0pre7.unpacked/libavcodec/i386/dsputil_mmx_avg.h	2005-04-16 16:41:13.000000000 -0400
+++ MPlayer-1.0pre7/libavcodec/i386/dsputil_mmx_avg.h	2005-05-29 13:15:32.000000000 -0400
@@ -90,7 +90,7 @@ static void DEF(put_pixels4_l2)(uint8_t 
 	"add	$16, %2			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -137,7 +137,7 @@ static void DEF(put_pixels8_l2)(uint8_t 
 	"add	$32, %2			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -207,7 +207,7 @@ static void DEF(put_no_rnd_pixels8_l2)(u
 	"add	$32, %2			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -262,7 +262,7 @@ static void DEF(avg_pixels4_l2)(uint8_t 
 	"add	$16, %2			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -314,7 +314,7 @@ static void DEF(avg_pixels8_l2)(uint8_t 
 	"add	$32, %2			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -402,7 +402,7 @@ static void DEF(put_pixels16_l2)(uint8_t
 	"add	$32, %2			\n\t"
 	"subl	$2, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -456,7 +456,7 @@ static void DEF(avg_pixels16_l2)(uint8_t
 	"add	$32, %2			\n\t"
 	"subl	$2, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -529,7 +529,7 @@ static void DEF(put_no_rnd_pixels16_l2)(
 	"add	$32, %2			\n\t"
 	"subl	$2, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
diff -Nrup MPlayer-1.0pre7.unpacked/libavcodec/i386/dsputil_mmx_rnd.h MPlayer-1.0pre7/libavcodec/i386/dsputil_mmx_rnd.h
--- MPlayer-1.0pre7.unpacked/libavcodec/i386/dsputil_mmx_rnd.h	2005-04-16 16:41:13.000000000 -0400
+++ MPlayer-1.0pre7/libavcodec/i386/dsputil_mmx_rnd.h	2005-05-29 13:01:00.000000000 -0400
@@ -96,7 +96,7 @@ static void DEF(put, pixels8_l2)(uint8_t
 	"add	%5, %3			\n\t"
 	"subl	$4, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
         :"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
         :"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
@@ -191,7 +191,7 @@ static void DEF(put, pixels16_l2)(uint8_
 	"add	$32, %2			\n\t"
 	"subl	$2, %0			\n\t"
 	"jnz	1b			\n\t"
-#ifdef PIC //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
+#ifdef __PIC__ //Note "+bm" and "+mb" are buggy too (with gcc 3.2.2 at least) and cant be used
 	:"+m"(h), "+a"(src1), "+c"(src2), "+d"(dst)
 #else
 	:"+b"(h), "+a"(src1), "+c"(src2), "+d"(dst)
diff -Nrup MPlayer-1.0pre7.unpacked/libavcodec/libpostproc/mangle.h MPlayer-1.0pre7/libavcodec/libpostproc/mangle.h
--- MPlayer-1.0pre7.unpacked/libavcodec/libpostproc/mangle.h	2005-04-16 16:41:13.000000000 -0400
+++ MPlayer-1.0pre7/libavcodec/libpostproc/mangle.h	2005-05-29 13:05:40.000000000 -0400
@@ -11,13 +11,13 @@
 /* Use rip-relative addressing if compiling PIC code on x86-64. */
 #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__OS2__) || \
    (defined(__OpenBSD__) && !defined(__ELF__))
-#if defined(ARCH_X86_64) && defined(PIC)
+#if defined(ARCH_X86_64) && defined(__PIC__)
 #define MANGLE(a) "_" #a"(%%rip)"
 #else
 #define MANGLE(a) "_" #a
 #endif
 #else
-#if defined(ARCH_X86_64) && defined(PIC)
+#if defined(ARCH_X86_64) && defined(__PIC__)
 #define MANGLE(a) #a"(%%rip)"
 #else
 #define MANGLE(a) #a
diff -Nrup MPlayer-1.0pre7.unpacked/libavcodec/msmpeg4.c MPlayer-1.0pre7/libavcodec/msmpeg4.c
--- MPlayer-1.0pre7.unpacked/libavcodec/msmpeg4.c	2005-04-16 16:41:13.000000000 -0400
+++ MPlayer-1.0pre7/libavcodec/msmpeg4.c	2005-05-29 12:55:56.000000000 -0400
@@ -723,7 +723,7 @@ static inline int msmpeg4_pred_dc(MpegEn
        necessitate to modify mpegvideo.c. The problem comes from the
        fact they decided to store the quantized DC (which would lead
        to problems if Q could vary !) */
-#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined PIC
+#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined __PIC__
     asm volatile(
         "movl %3, %%eax		\n\t"
 	"shrl $1, %%eax		\n\t"

Re: [gentoo-hardened] removing .text relocations from mplayer and xine-lib

[René Rhéaume]

I found out symlinking libtool-nofpic to libtool (which produces PIC
binaries) eliminates most of the relocations. I am able to build on
Gentoo either outside Portage or using my custom ebuild.

Just add "use x86 && has_pic && ln -sf libtool ${S}/libtool-nofpic"
right after econf. You can also comment RESTRICT="nostrip" in the
ebuild and add "strict" to your FEATURES to get the list of the
remaining TEXTREL binaries, which are on my system:

$(get-libdir)/xine/plugins/${PV}/post/xineplug_post_{planar,tvtime}.so
$(get-libdir)/xine/plugins/${PV}/xineplug_decode_{ff,w32dll,qt}.so

Feedback from other architectures is appreciated.

Also, it seems that "use x86 && has_pic && append-flags -UHAVE_MMX" is
not needed. I can build fine either with or without.

*This paragraph is more a note to myself, but can be interesting for
those with older gcc versions*
I also tried this symlinking trick on my half-Mandr* install and got
two build errors (make -k). It is probably a bug from that old
gcc-3.2-1mdk I get as I already have to patch xine-lib to disable SIMD
code generation in FAAD code even when I generate non-PIC code.
Faulty files are:
${S}/src/libffmpeg/libavcodec/i386/mpegvideo_mmx_template.c
${S}/src/libffmpeg/libavcodec/libpostproc/postprocess_template.c
Error message: can't find a register in class `GENERAL_REGS' while
reloading `asm'

OS Specs:
* Gentoo 2004.3, x86, hardened, µclibc 0.9.27, running kernel
2.4.30-hardened-r1, with Hardened GCC 3.3.5-r1
* half-Mandr* 9.0, i586, glibc 2.2.5, running kernel 2.4.28-19rrsecure
(lck+grsec+i2c+security fixes, mainly), with GCC 3.2-1mdk

-- 
gentoo-hardened@gentoo.org mailing list

Re: [gentoo-hardened] removing .text relocations from mplayer and xine-lib

[Peter S. Mazinger]

On Mon, 30 May 2005, René Rhéaume wrote:

> I found out symlinking libtool-nofpic to libtool (which produces PIC
> binaries) eliminates most of the relocations. I am able to build on
> Gentoo either outside Portage or using my custom ebuild.
> 
> Just add "use x86 && has_pic && ln -sf libtool ${S}/libtool-nofpic"
> right after econf. You can also comment RESTRICT="nostrip" in the
> ebuild and add "strict" to your FEATURES to get the list of the
> remaining TEXTREL binaries, which are on my system:

Better yet, add --enable-fpic to econf. The change proposed above w/ the 
link is allowed conditionally, if use has_pic && use x86 (probably amd64 
too)
 
> $(get-libdir)/xine/plugins/${PV}/post/xineplug_post_{planar,tvtime}.so
> $(get-libdir)/xine/plugins/${PV}/xineplug_decode_{ff,w32dll,qt}.so

xineplug_decode_ff.so is clean as of 1.0.1, I remove the rest from the 
system, else xine-lib fails to load (see original bug-report, failure on 
planar)

> 
> Feedback from other architectures is appreciated.
> 
> Also, it seems that "use x86 && has_pic && append-flags -UHAVE_MMX" is
> not needed. I can build fine either with or without.

it disables mmx/asm code for any case

> 
> *This paragraph is more a note to myself, but can be interesting for
> those with older gcc versions*
> I also tried this symlinking trick on my half-Mandr* install and got
> two build errors (make -k). It is probably a bug from that old
> gcc-3.2-1mdk I get as I already have to patch xine-lib to disable SIMD
> code generation in FAAD code even when I generate non-PIC code.
> Faulty files are:
> ${S}/src/libffmpeg/libavcodec/i386/mpegvideo_mmx_template.c
> ${S}/src/libffmpeg/libavcodec/libpostproc/postprocess_template.c
> Error message: can't find a register in class `GENERAL_REGS' while
> reloading `asm'

see how this is solved in the ffmpeg ebuild, important is to disable 
mmx/asm code.

Peter

-- 
Peter S. Mazinger <ps dot m at gmx dot net>           ID: 0xA5F059F2
Key fingerprint = 92A4 31E1 56BC 3D5A 2D08  BB6E C389 975E A5F0 59F2

-- 
gentoo-hardened@gentoo.org mailing list

Re: [gentoo-hardened] removing .text relocations from mplayer and xine-lib

[René Rhéaume]

> Better yet, add --enable-fpic to econf. The change proposed above w/ the
> link is allowed conditionally, if use has_pic && use x86 (probably amd64
> too)
Yes, --enable-fpic worked.

> xineplug_decode_ff.so is clean as of 1.0.1, I remove the rest from the
> system, else xine-lib fails to load (see original bug-report, failure on
> planar)
Which revision? I based my ebuild on 1.0.1-r1 and I have never been
able to suppress text relocations from xineplug_decode_ff.so. Grr, the
Xine team remade the ffmpeg build system from scratch using the GNU
autotools. Also, when I looked up for 'planar' in Gentoo Bugzilla, I
got the famous 'Zarro boogs found' message.

But why xineplug_decode_w32dll.so is built even when win32codecs is
not in USE? Looks like a build system bug to be resolved upstream.

-- 
gentoo-hardened@gentoo.org mailing list

Re: [gentoo-hardened] removing .text relocations from mplayer and xine-lib

[Peter S. Mazinger]

On Sat, 4 Jun 2005, René Rhéaume wrote:

> > Better yet, add --enable-fpic to econf. The change proposed above w/ the
> > link is allowed conditionally, if use has_pic && use x86 (probably amd64
> > too)
> Yes, --enable-fpic worked.
> 
> > xineplug_decode_ff.so is clean as of 1.0.1, I remove the rest from the
> > system, else xine-lib fails to load (see original bug-report, failure on
> > planar)
> Which revision? I based my ebuild on 1.0.1-r1 and I have never been

1.0.3 is clean for sure

> able to suppress text relocations from xineplug_decode_ff.so. Grr, the
> Xine team remade the ffmpeg build system from scratch using the GNU
> autotools. Also, when I looked up for 'planar' in Gentoo Bugzilla, I
> got the famous 'Zarro boogs found' message.

The text relocation in tvtime is due to MMX code usage (although 
-UHAVE_MMX is used, it is not honoured), I have changed ifdef ARCH_X86 w/
if defined(ARCH_X86) && defined(HAVE_MMX)

The text relocation in planar is due to faulty ffmpeg (libpostproc.a 's
objects are not built -fPIC)

I have solved it like this:
-ffmpeg is built fully PIC (also the objects for libpostproc.*)
-modified xine-lib/planar to use the installed libpostproc, not the one 
provided in xine-lib sources.

Peter

-- 
Peter S. Mazinger <ps dot m at gmx dot net>           ID: 0xA5F059F2
Key fingerprint = 92A4 31E1 56BC 3D5A 2D08  BB6E C389 975E A5F0 59F2

-- 
gentoo-hardened@gentoo.org mailing list