From owner-svn-src-stable@freebsd.org Thu Jul 26 19:00:31 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33CA8105763C; Thu, 26 Jul 2018 19:00:31 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DAE8E748CA; Thu, 26 Jul 2018 19:00:30 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBC155496; Thu, 26 Jul 2018 19:00:30 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6QJ0U8j091450; Thu, 26 Jul 2018 19:00:30 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6QJ0UaU091448; Thu, 26 Jul 2018 19:00:30 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201807261900.w6QJ0UaU091448@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 26 Jul 2018 19:00:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r336749 - stable/11/sys/kern X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/kern X-SVN-Commit-Revision: 336749 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2018 19:00:31 -0000 Author: markj Date: Thu Jul 26 19:00:30 2018 New Revision: 336749 URL: https://svnweb.freebsd.org/changeset/base/336749 Log: MFC r336504, r336507: Provide the full module path to preload_delete_name(). Modified: stable/11/sys/kern/link_elf.c stable/11/sys/kern/link_elf_obj.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/kern/link_elf.c ============================================================================== --- stable/11/sys/kern/link_elf.c Thu Jul 26 18:57:51 2018 (r336748) +++ stable/11/sys/kern/link_elf.c Thu Jul 26 19:00:30 2018 (r336749) @@ -1169,8 +1169,8 @@ link_elf_unload_file(linker_file_t file) static void link_elf_unload_preload(linker_file_t file) { - if (file->filename != NULL) - preload_delete_name(file->filename); + if (file->pathname != NULL) + preload_delete_name(file->pathname); } static const char * Modified: stable/11/sys/kern/link_elf_obj.c ============================================================================== --- stable/11/sys/kern/link_elf_obj.c Thu Jul 26 18:57:51 2018 (r336748) +++ stable/11/sys/kern/link_elf_obj.c Thu Jul 26 19:00:30 2018 (r336749) @@ -1030,9 +1030,8 @@ link_elf_unload_file(linker_file_t file) free(ef->ctftab, M_LINKER); free(ef->ctfoff, M_LINKER); free(ef->typoff, M_LINKER); - if (file->filename != NULL) - preload_delete_name(file->filename); - /* XXX reclaim module memory? */ + if (file->pathname != NULL) + preload_delete_name(file->pathname); return; }