diff --git a/refpolicy/Changelog b/refpolicy/Changelog index c760ebf9..2d701c90 100644 --- a/refpolicy/Changelog +++ b/refpolicy/Changelog @@ -1,3 +1,4 @@ +- Rename texrel_shlib_t to textrel_shlib_t. - Add swat to samba module. - Miscellaneous fixes from Dan Walsh. - Added modules: diff --git a/refpolicy/policy/modules/system/libraries.fc b/refpolicy/policy/modules/system/libraries.fc index 95104c1f..82fb18a3 100644 --- a/refpolicy/policy/modules/system/libraries.fc +++ b/refpolicy/policy/modules/system/libraries.fc @@ -42,9 +42,9 @@ ifdef(`distro_redhat',` # # /usr # -/usr(/.*)?/HelixPlayer/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr(/.*)?/HelixPlayer/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -/usr(/.*)?/java/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr(/.*)?/java/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr(/.*)?/java/.*\.jar -- gen_context(system_u:object_r:shlib_t,s0) /usr(/.*)?/java/.*\.jsa -- gen_context(system_u:object_r:shlib_t,s0) @@ -53,7 +53,7 @@ ifdef(`distro_redhat',` /usr(/.*)?/lib(64)?(/.*)?/ld-[^/]*\.so(\.[^/]*)* gen_context(system_u:object_r:ld_so_t,s0) -/usr(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr(/.*)?/nvidia/.*\.so(\..*)? -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/lib/pgsql/test/regress/.*\.so -- gen_context(system_u:object_r:shlib_t,s0) @@ -62,18 +62,18 @@ ifdef(`distro_redhat',` /usr/lib(64)?/im/.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0) /usr/lib(64)?/iiim/.*\.so.* -- gen_context(system_u:object_r:shlib_t,s0) -/usr/lib(64)?/libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr/lib(64)?/libGL(core)?\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/libGLU\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?(/.*)?/libnvidia.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -/usr/(local/)?lib/wine/.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/(local/)?lib/libfame-.*\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr/(local/)?lib/wine/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/(local/)?lib/libfame-.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr/local/.*\.so(\.[^/]*)* -- gen_context(system_u:object_r:shlib_t,s0) -/usr/X11R6/lib/libGL\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/X11R6/lib/libXvMCNVIDIA\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr/X11R6/lib/libGL\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/X11R6/lib/libXvMCNVIDIA\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) -/usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr/x11R6/lib/modules/extensions/libglx\.so(\.[^/]*)* -- gen_context(system_u:object_r:textrel_shlib_t,s0) ifdef(`distro_redhat',` /usr/lib/.*/program/.*\.so.* gen_context(system_u:object_r:shlib_t,s0) @@ -84,90 +84,90 @@ ifdef(`distro_redhat',` # Fedora Core packages: gstreamer-plugins, compat-libstdc++, Glide3, libdv # HelixPlayer, SDL, xorg-x11, xorg-x11-libs, Hermes, valgrind, openoffice.org-libs, httpd - php -/usr/lib/gstreamer-.*/libgstffmpeg\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/gstreamer-.*/libgsthermescolorspace\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/gstreamer-.*/libgstmms\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libstdc\+\+\.so\.2\.7\.2\.8 -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libg\+\+\.so\.2\.7\.2\.8 -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libglide3\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libdv\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/helix/plugins/oggfformat\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/helix/plugins/theorarend\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/helix/plugins/vorbisrend\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/helix/codecs/colorcvt\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/helix/codecs/cvt1\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libSDL-.*\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/X11R6/lib/modules/dri/.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/X11R6/lib/libOSMesa\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/X11R6/lib/libfglrx_gamma\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libHermes\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/valgrind/hp2ps -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/valgrind/stage2 -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/valgrind/vg.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/.*/program/libicudata\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/.*/program/libsts645li\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/.*/program/libvclplug_gen645li\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/.*/program/libwrp645li\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/.*/program/libswd680li\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib(64)?/.*/program/librecentfile\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib(64)?/.*/program/libsvx680li\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib(64)?/.*/program/libsoffice\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib(64)?/firefox.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib(64)?/mozilla.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib(64)?/sunbird.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib(64)?/thunderbird.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr/lib/gstreamer-.*/libgstffmpeg\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/gstreamer-.*/libgsthermescolorspace\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/gstreamer-.*/libgstmms\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libstdc\+\+\.so\.2\.7\.2\.8 -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libg\+\+\.so\.2\.7\.2\.8 -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libglide3\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libdv\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/helix/plugins/oggfformat\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/helix/plugins/theorarend\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/helix/plugins/vorbisrend\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/helix/codecs/colorcvt\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/helix/codecs/cvt1\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libSDL-.*\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/X11R6/lib/modules/dri/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/X11R6/lib/libOSMesa\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/X11R6/lib/libfglrx_gamma\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libHermes\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/valgrind/hp2ps -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/valgrind/stage2 -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/valgrind/vg.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/.*/program/libicudata\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/.*/program/libsts645li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/.*/program/libvclplug_gen645li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/.*/program/libwrp645li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/.*/program/libswd680li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/.*/program/librecentfile\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/.*/program/libsvx680li\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/.*/program/libcomphelp4gcc3\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/.*/program/libsoffice\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/firefox.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/mozilla.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/sunbird.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib(64)?/thunderbird.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) # Fedora Extras packages: ladspa, imlib2, ocaml -/usr/lib/ladspa/analogue_osc_1416\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/bandpass_a_iir_1893\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/bandpass_iir_1892\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/butterworth_1902\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/fm_osc_1415\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/gsm_1215\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/gverb_1216\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/hermes_filter_1200\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/highpass_iir_1890\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/lowpass_iir_1891\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/notch_iir_1894\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/pitch_scale_1193\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/pitch_scale_1194\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/sc1_1425\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/sc2_1426\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/sc3_1427\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/sc4_1882\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ladspa/se4_1883\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libImlib2\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/ocaml/stublibs/dllnums\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/httpd/modules/libphp5\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/php/modules/.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr/lib/ladspa/analogue_osc_1416\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/bandpass_a_iir_1893\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/bandpass_iir_1892\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/butterworth_1902\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/fm_osc_1415\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/gsm_1215\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/gverb_1216\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/hermes_filter_1200\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/highpass_iir_1890\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/lowpass_iir_1891\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/notch_iir_1894\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/pitch_scale_1193\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/pitch_scale_1194\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/sc1_1425\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/sc2_1426\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/sc3_1427\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/sc4_1882\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ladspa/se4_1883\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libImlib2\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/ocaml/stublibs/dllnums\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/httpd/modules/libphp5\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/php/modules/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) # Livna.org packages: xmms-mp3, ffmpeg, xvidcore, xine-lib, gsm, lame -/usr/lib/xmms/Input/libmpg123\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libpostproc\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libavformat-.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libavcodec-.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libxvidcore\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/xine/plugins/.*\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libgsm\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libmp3lame\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr/lib/xmms/Input/libmpg123\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libpostproc\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libavformat-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libavcodec-.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libxvidcore\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/xine/plugins/.*\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libgsm\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libmp3lame\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) # Flash plugin, Macromedia -HOME_DIR/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:texrel_shlib_t,s0) +HOME_DIR/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/.*/plugins/libflashplayer\.so.* -- gen_context(system_u:object_r:textrel_shlib_t,s0) # Jai, Sun Microsystems (Jpackage SPRM) -/usr/lib/libmlib_jai\.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libdivxdecore.so.0 -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr/lib/libdivxencore.so.0 -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr/lib/libmlib_jai\.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libdivxdecore.so.0 -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr/lib/libdivxencore.so.0 -- gen_context(system_u:object_r:textrel_shlib_t,s0) # Java, Sun Microsystems (JPackage SRPM) -/usr/.*/jre/lib/i386/libdeploy.so -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr/.*/jre/lib/i386/libdeploy.so -- gen_context(system_u:object_r:textrel_shlib_t,s0) /usr(/.*)?/Reader/intellinux/plug_ins/.*\.api -- gen_context(system_u:object_r:shlib_t,s0) -/usr(/.*)?/Reader/intellinux/plug_ins/AcroForm\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr(/.*)?/Reader/intellinux/plug_ins/EScript\.api -- gen_context(system_u:object_r:texrel_shlib_t,s0) -/usr(/.*)?/Reader/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:texrel_shlib_t,s0) +/usr(/.*)?/Reader/intellinux/plug_ins/AcroForm\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr(/.*)?/Reader/intellinux/plug_ins/EScript\.api -- gen_context(system_u:object_r:textrel_shlib_t,s0) +/usr(/.*)?/Reader/intellinux/SPPlugins/ADMPlugin\.apl -- gen_context(system_u:object_r:textrel_shlib_t,s0) ') dnl end distro_redhat ifdef(`distro_suse',` diff --git a/refpolicy/policy/modules/system/libraries.if b/refpolicy/policy/modules/system/libraries.if index 28911f03..05f69046 100644 --- a/refpolicy/policy/modules/system/libraries.if +++ b/refpolicy/policy/modules/system/libraries.if @@ -239,15 +239,15 @@ interface(`libs_relabelto_lib_files',` # interface(`libs_use_shared_libs',` gen_require(` - type lib_t, shlib_t, texrel_shlib_t; + type lib_t, shlib_t, textrel_shlib_t; ') files_list_usr($1) allow $1 lib_t:dir r_dir_perms; allow $1 lib_t:lnk_file r_file_perms; - allow $1 { shlib_t texrel_shlib_t }:lnk_file r_file_perms; - allow $1 { shlib_t texrel_shlib_t }:file rx_file_perms; - allow $1 texrel_shlib_t:file execmod; + allow $1 { shlib_t textrel_shlib_t }:lnk_file r_file_perms; + allow $1 { shlib_t textrel_shlib_t }:file rx_file_perms; + allow $1 textrel_shlib_t:file execmod; ') ######################################## @@ -261,11 +261,11 @@ interface(`libs_use_shared_libs',` # interface(`libs_legacy_use_shared_libs',` gen_require(` - type shlib_t, texrel_shlib_t; + type shlib_t, textrel_shlib_t; class file execmod; ') libs_use_shared_libs($1) - allow $1 { shlib_t texrel_shlib_t }:file execmod; + allow $1 { shlib_t textrel_shlib_t }:file execmod; ') diff --git a/refpolicy/policy/modules/system/libraries.te b/refpolicy/policy/modules/system/libraries.te index 79ac4684..f14b913e 100644 --- a/refpolicy/policy/modules/system/libraries.te +++ b/refpolicy/policy/modules/system/libraries.te @@ -1,5 +1,5 @@ -policy_module(libraries,1.1.1) +policy_module(libraries,1.1.2) ######################################## # @@ -25,7 +25,7 @@ type lib_t; files_type(lib_t) kernel_use_ld_so_from(lib_t,ld_so_t,ld_so_cache_t) -kernel_use_shared_libs_from(lib_t,{ shlib_t texrel_shlib_t }) +kernel_use_shared_libs_from(lib_t,{ shlib_t textrel_shlib_t }) # # shlib_t is the type of shared objects in the system lib @@ -42,8 +42,8 @@ ifdef(`targeted_policy',` # texrel_shlib_t is the type of shared objects in the system lib # directories, which require text relocation. # -type texrel_shlib_t; -files_type(texrel_shlib_t) +type textrel_shlib_t alias texrel_shlib_t; +files_type(textrel_shlib_t) ######################################## # @@ -62,8 +62,8 @@ allow ldconfig_t lib_t:lnk_file { getattr create read unlink }; allow ldconfig_t ld_so_t:lnk_file r_file_perms; allow ldconfig_t ld_so_t:file rx_file_perms; allow ldconfig_t ld_so_cache_t:file r_file_perms; -allow ldconfig_t { shlib_t texrel_shlib_t }:lnk_file r_file_perms; -allow ldconfig_t { shlib_t texrel_shlib_t }:file rx_file_perms; +allow ldconfig_t { shlib_t textrel_shlib_t }:lnk_file r_file_perms; +allow ldconfig_t { shlib_t textrel_shlib_t }:file rx_file_perms; kernel_read_system_state(ldconfig_t) diff --git a/refpolicy/policy/modules/system/unconfined.if b/refpolicy/policy/modules/system/unconfined.if index b6fe6031..6ec83dec 100644 --- a/refpolicy/policy/modules/system/unconfined.if +++ b/refpolicy/policy/modules/system/unconfined.if @@ -79,7 +79,6 @@ template(`unconfined_domain_template',` if (allow_execmod) { ifdef(`targeted_policy', `', ` # Allow text relocations on system shared libraries, e.g. libGL. - allow $1 texrel_shlib_t:file execmod; allow $1 home_type:file execmod; ') }