x86: Properly merge GNU_PROPERTY_X86_FEATURE_1_[IBT|SHSTK]

Message ID 20190313030311.26754-1-hjl.tools@gmail.com
State New
Headers show
Series
  • x86: Properly merge GNU_PROPERTY_X86_FEATURE_1_[IBT|SHSTK]
Related show

Commit Message

H.J. Lu March 13, 2019, 3:03 a.m.
Properly merge GNU_PROPERTY_X86_FEATURE_1_IBT and
GNU_PROPERTY_X86_FEATURE_1_SHSTK from -z ibt and -z shstk.

bfd/

	PR ld/24322
	* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Properly
	merge GNU_PROPERTY_X86_FEATURE_1_[IBT|SHSTK].

ld/

	PR ld/24322
	* testsuite/ld-i386/i386.exp: Run PR ld/24322 test.
	* testsuite/ld-x86-64/x86-64.exp: Likewise.
	* testsuite/ld-i386/pr24322.d: New file.
	* testsuite/ld-x86-64/pr24322-x32.d: Likewise.
	* testsuite/ld-x86-64/pr24322.d: Likewise.
	* testsuite/ld-x86-64/pr24322a.s: Likewise.
	* testsuite/ld-x86-64/pr24322b.s: Likewise.
---
 bfd/elfxx-x86.c                      |  4 ++--
 ld/testsuite/ld-i386/i386.exp        |  1 +
 ld/testsuite/ld-i386/pr24322.d       | 13 +++++++++++++
 ld/testsuite/ld-x86-64/pr24322-x32.d | 13 +++++++++++++
 ld/testsuite/ld-x86-64/pr24322.d     | 13 +++++++++++++
 ld/testsuite/ld-x86-64/pr24322a.s    | 27 +++++++++++++++++++++++++++
 ld/testsuite/ld-x86-64/pr24322b.s    |  4 ++++
 ld/testsuite/ld-x86-64/x86-64.exp    |  2 ++
 8 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 ld/testsuite/ld-i386/pr24322.d
 create mode 100644 ld/testsuite/ld-x86-64/pr24322-x32.d
 create mode 100644 ld/testsuite/ld-x86-64/pr24322.d
 create mode 100644 ld/testsuite/ld-x86-64/pr24322a.s
 create mode 100644 ld/testsuite/ld-x86-64/pr24322b.s

-- 
2.20.1

Comments

H.J. Lu March 13, 2019, 6:36 a.m. | #1
On Wed, Mar 13, 2019 at 11:03 AM H.J. Lu <hjl.tools@gmail.com> wrote:
>

> Properly merge GNU_PROPERTY_X86_FEATURE_1_IBT and

> GNU_PROPERTY_X86_FEATURE_1_SHSTK from -z ibt and -z shstk.

>

> bfd/

>

>         PR ld/24322

>         * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Properly

>         merge GNU_PROPERTY_X86_FEATURE_1_[IBT|SHSTK].

>

> ld/

>

>         PR ld/24322

>         * testsuite/ld-i386/i386.exp: Run PR ld/24322 test.

>         * testsuite/ld-x86-64/x86-64.exp: Likewise.

>         * testsuite/ld-i386/pr24322.d: New file.

>         * testsuite/ld-x86-64/pr24322-x32.d: Likewise.

>         * testsuite/ld-x86-64/pr24322.d: Likewise.

>         * testsuite/ld-x86-64/pr24322a.s: Likewise.

>         * testsuite/ld-x86-64/pr24322b.s: Likewise.


This is what I checked in.


-- 
H.J.
From 5ae6520559730aae2cb62cbbb1f17226207e3719 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Wed, 13 Mar 2019 10:58:39 +0800
Subject: [PATCH] x86: Properly set IBT and SHSTK properties for -z ibt/shstk

There should be no AND properties if some input doesn't have them.  We
should set IBT and SHSTK properties for -z ibt and -z shstk if needed.

bfd/

	PR ld/24322
	* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Properly
	merge GNU_PROPERTY_X86_FEATURE_1_[IBT|SHSTK].

ld/

	PR ld/24322
	* testsuite/ld-i386/i386.exp: Run PR ld/24322 tests.
	* testsuite/ld-x86-64/x86-64.exp: Likewise.
	* testsuite/ld-i386/pr24322a.d: New file.
	* testsuite/ld-i386/pr24322b.d: Likewise.
	* testsuite/ld-x86-64/pr24322a-x32.d: Likewise.
	* testsuite/ld-x86-64/pr24322a.d: Likewise.
	* testsuite/ld-x86-64/pr24322b-x32.d: Likewise.
	* testsuite/ld-x86-64/pr24322b.d: Likewise.
	* testsuite/ld-x86-64/pr24322a.s: Likewise.
	* testsuite/ld-x86-64/pr24322b.s: Likewise.
	* testsuite/ld-x86-64/pr24322c.s: Likewise.
---
 bfd/elfxx-x86.c                       | 12 ++++++------
 ld/testsuite/ld-i386/i386.exp         |  2 ++
 ld/testsuite/ld-i386/pr24322a.d       | 12 ++++++++++++
 ld/testsuite/ld-i386/pr24322b.d       | 12 ++++++++++++
 ld/testsuite/ld-x86-64/pr24322a-x32.d | 12 ++++++++++++
 ld/testsuite/ld-x86-64/pr24322a.d     | 12 ++++++++++++
 ld/testsuite/ld-x86-64/pr24322a.s     | 27 +++++++++++++++++++++++++++
 ld/testsuite/ld-x86-64/pr24322b-x32.d | 12 ++++++++++++
 ld/testsuite/ld-x86-64/pr24322b.d     | 12 ++++++++++++
 ld/testsuite/ld-x86-64/pr24322b.s     |  4 ++++
 ld/testsuite/ld-x86-64/pr24322c.s     | 27 +++++++++++++++++++++++++++
 ld/testsuite/ld-x86-64/x86-64.exp     |  4 ++++
 12 files changed, 142 insertions(+), 6 deletions(-)
 create mode 100644 ld/testsuite/ld-i386/pr24322a.d
 create mode 100644 ld/testsuite/ld-i386/pr24322b.d
 create mode 100644 ld/testsuite/ld-x86-64/pr24322a-x32.d
 create mode 100644 ld/testsuite/ld-x86-64/pr24322a.d
 create mode 100644 ld/testsuite/ld-x86-64/pr24322a.s
 create mode 100644 ld/testsuite/ld-x86-64/pr24322b-x32.d
 create mode 100644 ld/testsuite/ld-x86-64/pr24322b.d
 create mode 100644 ld/testsuite/ld-x86-64/pr24322b.s
 create mode 100644 ld/testsuite/ld-x86-64/pr24322c.s

diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index d6b851ce78..584a75f996 100644
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -2496,6 +2496,9 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
 	}
       else
 	{
+	  /* There should be no AND properties since some input doesn't
+	     have them.  Set IBT and SHSTK properties for -z ibt and -z
+	     shstk if needed.  */
 	  features = 0;
 	  if (info->ibt)
 	    features = GNU_PROPERTY_X86_FEATURE_1_IBT;
@@ -2503,18 +2506,15 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
 	    features |= GNU_PROPERTY_X86_FEATURE_1_SHSTK;
 	  if (features)
 	    {
-	      /* Add GNU_PROPERTY_X86_FEATURE_1_IBT and
-		 GNU_PROPERTY_X86_FEATURE_1_SHSTK.  */
 	      if (aprop != NULL)
 		{
-		  number = aprop->u.number;
-		  aprop->u.number = number | features;
-		  updated = number != (unsigned int) aprop->u.number;
+		  updated = features != (unsigned int) aprop->u.number;
+		  aprop->u.number = features;
 		}
 	      else
 		{
-		  bprop->u.number |= features;
 		  updated = TRUE;
+		  bprop->u.number = features;
 		}
 	    }
 	  else if (aprop != NULL)
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index e51a4c30f6..1a1a7500e9 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -483,6 +483,8 @@ run_dump_test "pr23486c"
 run_dump_test "pr23486d"
 run_dump_test "pr23854"
 run_dump_test "pr23930"
+run_dump_test "pr24322a"
+run_dump_test "pr24322b"
 
 if { !([istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
diff --git a/ld/testsuite/ld-i386/pr24322a.d b/ld/testsuite/ld-i386/pr24322a.d
new file mode 100644
index 0000000000..a00ace3f7d
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr24322a.d
@@ -0,0 +1,12 @@
+#source: ../ld-x86-64/pr24322a.s
+#source: ../ld-x86-64/pr24322b.s
+#as: --32 -mx86-used-note=yes
+#ld: -z shstk -m elf_i386
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-i386/pr24322b.d b/ld/testsuite/ld-i386/pr24322b.d
new file mode 100644
index 0000000000..8c66096847
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr24322b.d
@@ -0,0 +1,12 @@
+#source: ../ld-x86-64/pr24322c.s
+#source: ../ld-x86-64/pr24322b.s
+#as: --32 -mx86-used-note=yes
+#ld: -z shstk -m elf_i386
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24322a-x32.d b/ld/testsuite/ld-x86-64/pr24322a-x32.d
new file mode 100644
index 0000000000..7f06a65eee
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322a-x32.d
@@ -0,0 +1,12 @@
+#source: pr24322a.s
+#source: pr24322b.s
+#as: --x32 -mx86-used-note=yes
+#ld: -z shstk -m elf32_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24322a.d b/ld/testsuite/ld-x86-64/pr24322a.d
new file mode 100644
index 0000000000..4b992b4479
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322a.d
@@ -0,0 +1,12 @@
+#source: pr24322a.s
+#source: pr24322b.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -z shstk -melf_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000030	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24322a.s b/ld/testsuite/ld-x86-64/pr24322a.s
new file mode 100644
index 0000000000..15989d6901
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322a.s
@@ -0,0 +1,27 @@
+	.section ".note.gnu.property", "a"
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+	.long 1f - 0f		/* name length */
+	.long 5f - 2f		/* data length */
+	.long 5			/* note type */
+0:	.asciz "GNU"		/* vendor name */
+1:
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+2:	.long 0xc0000002	/* pr_type.  */
+	.long 4f - 3f		/* pr_datasz.  */
+3:
+	.long 0x3
+4:
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+5:
diff --git a/ld/testsuite/ld-x86-64/pr24322b-x32.d b/ld/testsuite/ld-x86-64/pr24322b-x32.d
new file mode 100644
index 0000000000..3199cb1652
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322b-x32.d
@@ -0,0 +1,12 @@
+#source: pr24322c.s
+#source: pr24322b.s
+#as: --x32 -mx86-used-note=yes
+#ld: -z shstk -m elf32_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24322b.d b/ld/testsuite/ld-x86-64/pr24322b.d
new file mode 100644
index 0000000000..b391774322
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322b.d
@@ -0,0 +1,12 @@
+#source: pr24322c.s
+#source: pr24322b.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -z shstk -melf_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000030	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24322b.s b/ld/testsuite/ld-x86-64/pr24322b.s
new file mode 100644
index 0000000000..36812352a6
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322b.s
@@ -0,0 +1,4 @@
+	.text
+	.global _start
+_start:
+	ret
diff --git a/ld/testsuite/ld-x86-64/pr24322c.s b/ld/testsuite/ld-x86-64/pr24322c.s
new file mode 100644
index 0000000000..6a6b517fd0
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322c.s
@@ -0,0 +1,27 @@
+	.section ".note.gnu.property", "a"
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+	.long 1f - 0f		/* name length */
+	.long 5f - 2f		/* data length */
+	.long 5			/* note type */
+0:	.asciz "GNU"		/* vendor name */
+1:
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+2:	.long 0xc0000002	/* pr_type.  */
+	.long 4f - 3f		/* pr_datasz.  */
+3:
+	.long 0x0
+4:
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+5:
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index b03aaced91..47d92c9ab1 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -426,6 +426,10 @@ run_dump_test "pr23930"
 run_dump_test "pr23930-x32"
 run_dump_test "pr24151a"
 run_dump_test "pr24151a-x32"
+run_dump_test "pr24322a"
+run_dump_test "pr24322a-x32"
+run_dump_test "pr24322b"
+run_dump_test "pr24322b-x32"
 
 if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
     return

Patch

diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index d6b851ce78..ecffffc95d 100644
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -2508,12 +2508,12 @@  _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info,
 	      if (aprop != NULL)
 		{
 		  number = aprop->u.number;
-		  aprop->u.number = number | features;
+		  aprop->u.number = number & features;
 		  updated = number != (unsigned int) aprop->u.number;
 		}
 	      else
 		{
-		  bprop->u.number |= features;
+		  bprop->u.number &= features;
 		  updated = TRUE;
 		}
 	    }
diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp
index e51a4c30f6..dbe11b37f4 100644
--- a/ld/testsuite/ld-i386/i386.exp
+++ b/ld/testsuite/ld-i386/i386.exp
@@ -483,6 +483,7 @@  run_dump_test "pr23486c"
 run_dump_test "pr23486d"
 run_dump_test "pr23854"
 run_dump_test "pr23930"
+run_dump_test "pr24322"
 
 if { !([istarget "i?86-*-linux*"]
        || [istarget "i?86-*-gnu*"]
diff --git a/ld/testsuite/ld-i386/pr24322.d b/ld/testsuite/ld-i386/pr24322.d
new file mode 100644
index 0000000000..4506608f1d
--- /dev/null
+++ b/ld/testsuite/ld-i386/pr24322.d
@@ -0,0 +1,13 @@ 
+#source: ../ld-x86-64/pr24322a.s
+#source: ../ld-x86-64/pr24322b.s
+#source: ../ld-x86-64/pr24322a.s
+#as: --32 -mx86-used-note=yes
+#ld: -z shstk -m elf_i386
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24322-x32.d b/ld/testsuite/ld-x86-64/pr24322-x32.d
new file mode 100644
index 0000000000..d3fa16686e
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322-x32.d
@@ -0,0 +1,13 @@ 
+#source: pr24322a.s
+#source: pr24322b.s
+#source: pr24322a.s
+#as: --x32 -mx86-used-note=yes
+#ld: -z shstk -m elf32_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000024	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24322.d b/ld/testsuite/ld-x86-64/pr24322.d
new file mode 100644
index 0000000000..b7716738a9
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322.d
@@ -0,0 +1,13 @@ 
+#source: pr24322a.s
+#source: pr24322b.s
+#source: pr24322a.s
+#as: --64 -defsym __64_bit__=1 -mx86-used-note=yes
+#ld: -z shstk -melf_x86_64
+#readelf: -n
+
+Displaying notes found in: .note.gnu.property
+  Owner                 Data size	Description
+  GNU                  0x00000030	NT_GNU_PROPERTY_TYPE_0
+      Properties: x86 feature: SHSTK
+	x86 ISA used: <None>
+	x86 feature used: x86
diff --git a/ld/testsuite/ld-x86-64/pr24322a.s b/ld/testsuite/ld-x86-64/pr24322a.s
new file mode 100644
index 0000000000..15989d6901
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322a.s
@@ -0,0 +1,27 @@ 
+	.section ".note.gnu.property", "a"
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+	.long 1f - 0f		/* name length */
+	.long 5f - 2f		/* data length */
+	.long 5			/* note type */
+0:	.asciz "GNU"		/* vendor name */
+1:
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+2:	.long 0xc0000002	/* pr_type.  */
+	.long 4f - 3f		/* pr_datasz.  */
+3:
+	.long 0x3
+4:
+.ifdef __64_bit__
+	.p2align 3
+.else
+	.p2align 2
+.endif
+5:
diff --git a/ld/testsuite/ld-x86-64/pr24322b.s b/ld/testsuite/ld-x86-64/pr24322b.s
new file mode 100644
index 0000000000..36812352a6
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/pr24322b.s
@@ -0,0 +1,4 @@ 
+	.text
+	.global _start
+_start:
+	ret
diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp
index b03aaced91..8305ca509e 100644
--- a/ld/testsuite/ld-x86-64/x86-64.exp
+++ b/ld/testsuite/ld-x86-64/x86-64.exp
@@ -426,6 +426,8 @@  run_dump_test "pr23930"
 run_dump_test "pr23930-x32"
 run_dump_test "pr24151a"
 run_dump_test "pr24151a-x32"
+run_dump_test "pr24322"
+run_dump_test "pr24322-x32"
 
 if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} {
     return