ld: Check archive only for archive member

Since plugin_maybe_claim calls bfd_close on the original input BFD if it
isn't an archive member, pass NULL to bfd_plugin_close_file_descriptor
to indicate that the BFD isn't an archive member.

bfd/

	PR ld/18028
	* plugin.c (bfd_plugin_close_file_descriptor): Check archive
	only of abfd != NULL.
	(try_claim): Pass NULL to bfd_plugin_close_file_descriptor if
	it isn't an archive member.

ld/

	PR ld/18028
	* plugin.c (plugin_input_file): Add comments for abfd and ibfd.
	(plugin_object_p): Set input->ibfd to NULL if it isn't an
	archive member.

(cherry picked from commit 7a30ac441a4e776e68399cb916c4731b5192e931)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e4f708f9aae7a08f3cafd035b5b2ede4ab0aaa56..39c7fd73f9220ed3836f92d75bf6cea7d8695e5c 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2021-07-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/18028
+       * plugin.c (bfd_plugin_close_file_descriptor): Check archive
+       only of abfd != NULL.
+       (try_claim): Pass NULL to bfd_plugin_close_file_descriptor if
+       it isn't an archive member.
+
 2021-07-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * sysdep.h [!ENABLE_NLS]: Prevent inclusion of <libintl.h> on

diff --git a/bfd/plugin.c b/bfd/plugin.c
index b3d6739dabbf172b439454358bfa2af62ef6ff18..6cfa2b6647041772a3492f996c01f93c3ba19aa0 100644 (file)
--- a/bfd/plugin.c
+++ b/bfd/plugin.c
@@ -277,27 +277,26 @@ bfd_plugin_open_input (bfd *ibfd, struct ld_plugin_input_file *file)
   return 1;
 }
 
-/* Close the plugin file descriptor.  */
+/* Close the plugin file descriptor FD.  If ABFD isn't NULL, it is an
+   archive member.   */
 
 void
 bfd_plugin_close_file_descriptor (bfd *abfd, int fd)
 {
-  bfd *iobfd;
-
-  iobfd = abfd;
-  while (iobfd->my_archive
-        && !bfd_is_thin_archive (iobfd->my_archive))
-    iobfd = iobfd->my_archive;
-  if (iobfd == abfd)
+  if (abfd == NULL)
     close (fd);
   else
     {
-      iobfd->archive_plugin_fd_open_count--;
+      while (abfd->my_archive
+            && !bfd_is_thin_archive (abfd->my_archive))
+       abfd = abfd->my_archive;
+
+      abfd->archive_plugin_fd_open_count--;
       /* Dup the archive plugin file descriptor for later use, which
         will be closed by _bfd_archive_close_and_cleanup.  */
-      if (iobfd->archive_plugin_fd_open_count == 0)
+      if (abfd->archive_plugin_fd_open_count == 0)
        {
-         iobfd->archive_plugin_fd = dup (fd);
+         abfd->archive_plugin_fd = dup (fd);
          close (fd);
        }
     }
@@ -314,7 +313,9 @@ try_claim (bfd *abfd)
       && current_plugin->claim_file)
     {
       current_plugin->claim_file (&file, &claimed);
-      bfd_plugin_close_file_descriptor (abfd, file.fd);
+      bfd_plugin_close_file_descriptor ((abfd->my_archive != NULL
+                                        ? abfd : NULL),
+                                       file.fd);
     }
 
   return claimed;

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 537b5df6311b41390cfc1f47ced3baa145711115..b7d9656d5d47df2e9a0588d917c4deb84ef64187 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2021-07-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/18028
+       * plugin.c (plugin_input_file): Add comments for abfd and ibfd.
+       (plugin_object_p): Set input->ibfd to NULL if it isn't an
+       archive member.
+
 2021-07-05  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/28040

diff --git a/ld/plugin.c b/ld/plugin.c
index bb369f46955eb641ff9bfcc19b57e83f9e216e5e..b91a958b812db6b16214cf6d56ec972ac6b14417 100644 (file)
--- a/ld/plugin.c
+++ b/ld/plugin.c
@@ -102,7 +102,9 @@ typedef struct view_buffer
    pointer.  */
 typedef struct plugin_input_file
 {
+  /* The dummy BFD.  */
   bfd *abfd;
+  /* The original input BFD.  Non-NULL if it is an archive member.  */
   bfd *ibfd;
   view_buffer_t view_buffer;
   char *name;
@@ -1220,7 +1222,7 @@ plugin_object_p (bfd *ibfd)
 
   file.handle = input;
   input->abfd = abfd;
-  input->ibfd = ibfd;
+  input->ibfd = ibfd->my_archive != NULL ? ibfd : NULL;
   input->view_buffer.addr = NULL;
   input->view_buffer.filesize = 0;
   input->view_buffer.offset = 0;