From patchwork Mon Apr 13 13:03:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Roberts X-Patchwork-Id: 11485555 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1D8B9174A for ; Mon, 13 Apr 2020 13:04:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 048FC2075E for ; Mon, 13 Apr 2020 13:04:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kpqjJn6v" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729727AbgDMNEF (ORCPT ); Mon, 13 Apr 2020 09:04:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727954AbgDMNEF (ORCPT ); Mon, 13 Apr 2020 09:04:05 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0A81C0A3BE2 for ; Mon, 13 Apr 2020 06:04:04 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id i3so392821pgk.1 for ; Mon, 13 Apr 2020 06:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bhGxa8/BsJXmYNu/avTJZdI46VSdtL1iMSMz+/eHO3U=; b=kpqjJn6vqri2s8G87KxGTHnxung3YiDqq6mwQvpoxKatZYUU5I3E7t6afgQG32ZIaW /w0W+RAGjNxWBKqpOu2FhTEa0RfOO+vuHKyLMXGXQ+PYCP6JcZv7IJk9pdD4hEYoscC0 Z5Z1/aodOVVVQ+E3aCZoSTUDkLVo+QcTN5071/pGUgi3opl25yw730doVJ2sdXD1OZBq iMYS8hyEUQAk/NQNwMcq9Ttdj//b5ghjbDB31zwX+eOSianlN+T8f+6u6nX6rj8V+PdN Oy+ATWnUTNZecfsHSMGMoZhMdzm3mtGBHuVHjTBagq4/yqPai3flC3YTMefScwPmNSTX t/rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bhGxa8/BsJXmYNu/avTJZdI46VSdtL1iMSMz+/eHO3U=; b=d22MlpeUkEP6WBEH61ACPHee5QQ+Fb6vCzTYg+9dbgjTYkz1vWdSc1bfadFTsGCx5F WEQRroYra0OX3RVeSzhGG3xmhBKlUhlmbBjcF84mL1CGVhPS9a1ho01bsZKpkzbHz+Nl GDI7Qj5irJvRoywg/sr6gA52TPtyShwJI9EL1x81/uOCd40nFoOPGr79Q+9Fn7/ejh+z /3CehABYTAx1yESXfw5nikuYrAsqu4Tsx3DANF51InJA1C0vFH36299HExlj/yHImSMD 5xKGChAOVYFXpjjCezJnVlE6H8Wnjzcy4e7DvzB4XTVu5LV10nXU/Azc+2QwXQHgysZD 91Kw== X-Gm-Message-State: AGi0Pual4A6fUkS4S3O+eUpOK25E1E7J7Xy/MuPsUBdAy2ncshoB6rDw uuhoDx/E9dtJ99q3ACiBM3E= X-Google-Smtp-Source: APiQypL7DjUztostoMC0bP4znPm5fTZG7HdtzkGKXBS5nzw5jXlIkT/y4ebFInTgsRtZb2oyLMC1JQ== X-Received: by 2002:a62:55c7:: with SMTP id j190mr17275177pfb.65.1586783044458; Mon, 13 Apr 2020 06:04:04 -0700 (PDT) Received: from localhost.localdomain ([134.134.139.76]) by smtp.gmail.com with ESMTPSA id g3sm7909344pgd.64.2020.04.13.06.04.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 06:04:04 -0700 (PDT) From: bill.c.roberts@gmail.com X-Google-Original-From: william.c.roberts@intel.com To: bill.c.roberts@gmail.com Cc: nicolas.iooss@m4x.org, selinux@vger.kernel.org, william.c.roberts@intel.com Subject: [PATCH v2 1/2] libsemanage: fix linker script symbol versions Date: Mon, 13 Apr 2020 08:03:58 -0500 Message-Id: <20200413130359.25372-1-william.c.roberts@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org From: William Roberts In previous work to cleanup the exports and linker scripts, I introduced a regression causing symbols to be named in both the 1.0 and 1.1 sections. This went un-noticed and was reported by nicolas.iooss@m4x.org. Previous patches checked for correctness by: This was checked by generating an old export map (from master): nm --defined-only -g ./src/libsemanage.so | cut -d' ' -f 3-3 | grep -v '^_' > old.map Then creating a new one for this library after this patch is applied: nm --defined-only -g ./src/libsemanage.so | cut -d' ' -f 3-3 | grep -v '^_' > new.map And diffing them: Acked-by: Nicolas Iooss diff old.map new.map However, this discards the version information. Nicolas points out a better way, by using objdump so we can see the version information. A better sequence of commands for checking is as follows: git checkout 1967477913f6e objdump -T ./src/libsemanage.so | grep LIBSEMANAGE | cut -d' ' -f 8- | sed 's/^ //' > map.old git checkout origin/master objdump -T ./src/libsemanage.so | grep LIBSEMANAGE | cut -d' ' -f 8- | sed 's/^ //' > map.new diff map.old map.new Signed-off-by: William Roberts --- libsemanage/src/libsemanage.map | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/libsemanage/src/libsemanage.map b/libsemanage/src/libsemanage.map index ff5977b9f483..8ba2746deaa2 100644 --- a/libsemanage/src/libsemanage.map +++ b/libsemanage/src/libsemanage.map @@ -76,10 +76,7 @@ LIBSEMANAGE_1.0 { semanage_fcontext_set_con; semanage_fcontext_set_expr; semanage_fcontext_set_type; - semanage_get_default_priority; semanage_get_disable_dontaudit; - semanage_get_hll_compiler_path; - semanage_get_ignore_module_cache; semanage_get_preserve_tunables; semanage_handle_create; semanage_handle_destroy; @@ -170,39 +167,17 @@ LIBSEMANAGE_1.0 { semanage_mls_enabled; semanage_module_disable; semanage_module_enable; - semanage_module_extract; semanage_module_get_enabled; - semanage_module_get_module_info; semanage_module_get_name; semanage_module_get_version; - semanage_module_info_create; semanage_module_info_datum_destroy; - semanage_module_info_destroy; - semanage_module_info_get_enabled; - semanage_module_info_get_lang_ext; - semanage_module_info_get_name; - semanage_module_info_get_priority; - semanage_module_info_set_enabled; - semanage_module_info_set_lang_ext; - semanage_module_info_set_name; - semanage_module_info_set_priority; semanage_module_install; semanage_module_install_base; semanage_module_install_base_file; semanage_module_install_file; - semanage_module_install_info; - semanage_module_key_create; - semanage_module_key_destroy; - semanage_module_key_get_name; - semanage_module_key_get_priority; - semanage_module_key_set_name; - semanage_module_key_set_priority; semanage_module_list; - semanage_module_list_all; semanage_module_list_nth; semanage_module_remove; - semanage_module_remove_key; - semanage_module_set_enabled; semanage_module_upgrade; semanage_module_upgrade_file; semanage_msg_get_channel; @@ -276,14 +251,11 @@ LIBSEMANAGE_1.0 { semanage_select_store; semanage_set_check_contexts; semanage_set_create_store; - semanage_set_default_priority; semanage_set_disable_dontaudit; - semanage_set_ignore_module_cache; semanage_set_preserve_tunables; semanage_set_rebuild; semanage_set_reload; semanage_set_root; - semanage_set_store_root; semanage_seuser_clone; semanage_seuser_compare; semanage_seuser_compare2; From patchwork Mon Apr 13 13:03:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Roberts X-Patchwork-Id: 11485557 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8F29A14B4 for ; Mon, 13 Apr 2020 13:04:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 763D52072C for ; Mon, 13 Apr 2020 13:04:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dAotrt97" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729728AbgDMNEI (ORCPT ); Mon, 13 Apr 2020 09:04:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727954AbgDMNEH (ORCPT ); Mon, 13 Apr 2020 09:04:07 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7FEDC0A3BE2 for ; Mon, 13 Apr 2020 06:04:06 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id e16so3504104pjp.1 for ; Mon, 13 Apr 2020 06:04:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=k0w8xBYwQgPG2t1tX3rBZTISes1t8zM6frRkNqKaqyc=; b=dAotrt974KtlHO4drya6R01mS+QN7T7ftvSwAz6y72Ru7NjN0YdHWl/AAtLs0wH6KU //HIP9b7sbqchP9J+Ls11gOqWgUFARZYCAempowmiNNREMh97GzXlYTLCDL6f9Us31nP RJKVc8aYHAoga35/BWpf9rcYZLSLLZv8ULvh603jeUj3EIjEBEEuCMBqXR8q4L8ubx8c ZUOTkLMx8m5Pc75gTBj0WWEe5tKw6Dyagt1ut/rrPYUHP7cA/2PKoCV0YTnsmTiY0oFE tDNbtq7t8puer1kCDsMxsn8ArOKtHhGrNFsKIeAsg7UNz8J7hw5ntnzFsF7zFQDM2fcJ KBdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=k0w8xBYwQgPG2t1tX3rBZTISes1t8zM6frRkNqKaqyc=; b=b8Jd5tN0o90tfepQMScVOqqBaTAvRquITyF16RxS5/6xAnXxcckrdQWY9lZ66WAqpX CG0OoLo5cdOXitcOiLxxAQTJEi+mzLsq7u03/WtEZFa0mYqbdKyjEP7ij123XM5mAYIC SbAwsepQiCaAODEb3VE6pgOTVJQsEbzHISHzkDntTm1DDXrosIK+sH+I/D5f52SQbRzg CO0j5JSH7yobx+iLleQRw90mwAvahIVFmInV1jCLXi7c59zE/YAUCTnxTB2bJnFpR/V8 LKOvHbjxWdlyTENQj8fu9nf+bQc8dALf+sCpuq2SFN3C1ULn7ZuszpfeudzRgAUQxSEm a1mw== X-Gm-Message-State: AGi0PuaAE2NIRs+bTe1aI5IJvjRR3cNUKkGq/8fINR9/ySagvVlNSngn 4toCB2b8ecQJ0b8sIyHnUt0= X-Google-Smtp-Source: APiQypKd9Qh5IXv5Km9sUJSdTzj3arJ1eMvPu6/YVl6LVnsyT/FkQZttR60Cr+nT6LGpiiIIUey51Q== X-Received: by 2002:a17:90a:fe8:: with SMTP id 95mr19000010pjz.45.1586783046324; Mon, 13 Apr 2020 06:04:06 -0700 (PDT) Received: from localhost.localdomain ([134.134.139.76]) by smtp.gmail.com with ESMTPSA id g3sm7909344pgd.64.2020.04.13.06.04.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 06:04:05 -0700 (PDT) From: bill.c.roberts@gmail.com X-Google-Original-From: william.c.roberts@intel.com To: bill.c.roberts@gmail.com Cc: nicolas.iooss@m4x.org, selinux@vger.kernel.org, william.c.roberts@intel.com Subject: [PATCH v2 2/2] libsemanage: rm semanage_module_upgrade_info from map Date: Mon, 13 Apr 2020 08:03:59 -0500 Message-Id: <20200413130359.25372-2-william.c.roberts@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200413130359.25372-1-william.c.roberts@intel.com> References: <20200413130359.25372-1-william.c.roberts@intel.com> Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org From: William Roberts This routine was never defined, just declared as a prototype. Thus it never really existed, but remained in the map file. Remove it. Signed-off-by: William Roberts --- libsemanage/src/libsemanage.map | 1 - 1 file changed, 1 deletion(-) diff --git a/libsemanage/src/libsemanage.map b/libsemanage/src/libsemanage.map index 8ba2746deaa2..1375a8ca0ea7 100644 --- a/libsemanage/src/libsemanage.map +++ b/libsemanage/src/libsemanage.map @@ -349,7 +349,6 @@ LIBSEMANAGE_1.1 { semanage_module_get_enabled; semanage_module_set_enabled; semanage_module_install_info; - semanage_module_upgrade_info; semanage_module_remove_key; semanage_set_store_root; } LIBSEMANAGE_1.0;