This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit ad959d4c7bced43649b1aefc30beadc06f93111a Author: Guillem Jover <[email protected]> Date: Wed Feb 11 06:46:42 2015 +0100 dpkg: Move SE Linux support into a separate file This will allow to use the code in dpkg-statoverride, and unclutters the tar handling code. --- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/archives.c | 99 +--------------------------------------- src/main.h | 6 +++ src/selinux.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 148 insertions(+), 98 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 3389df0..1dbde58 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -66,6 +66,7 @@ src/querycmd.c src/remove.c src/script.c src/select.c +src/selinux.c src/statcmd.c src/statdb.c src/trigcmd.c diff --git a/src/Makefile.am b/src/Makefile.am index 2382d75..09a7330 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,6 +51,7 @@ dpkg_SOURCES = \ remove.c \ script.c \ select.c \ + selinux.c \ trigproc.c \ unpack.c \ update.c \ diff --git a/src/archives.c b/src/archives.c index 8648755..c6438f1 100644 --- a/src/archives.c +++ b/src/archives.c @@ -56,12 +56,6 @@ #include <dpkg/options.h> #include <dpkg/triglib.h> -#ifdef WITH_SELINUX -#include <selinux/selinux.h> -#include <selinux/avc.h> -#include <selinux/label.h> -#endif - #include "filesdb.h" #include "main.h" #include "archives.h" @@ -481,101 +475,10 @@ tarobject_set_perms(struct tar_entry *te, const char *path, struct file_stat *st } } -#ifdef WITH_SELINUX -static struct selabel_handle *dpkg_sehandle; - -static struct selabel_handle * -dpkg_selabel_get_handle(void) -{ - return dpkg_sehandle; -} -#endif - -static void -dpkg_selabel_load(void) -{ -#ifdef WITH_SELINUX - static int selinux_enabled = -1; - - if (selinux_enabled < 0) { - int rc; - - /* Set selinux_enabled if it is not already set (singleton). */ - selinux_enabled = (is_selinux_enabled() > 0); - if (!selinux_enabled) - return; - - /* Open the SELinux status notification channel, with fallback enabled - * for older kernels. */ - rc = selinux_status_open(1); - if (rc < 0) - ohshit(_("cannot open security status notification channel")); - - /* XXX: We could use selinux_set_callback() to redirect the errors from - * the other SELinux calls, but that does not seem worth it right now. */ - } else if (selinux_enabled && selinux_status_updated()) { - /* The SELinux policy got updated in the kernel, usually after upgrading - * the package shipping it, we need to reload. */ - selabel_close(dpkg_sehandle); - } else { - /* SELinux is either disabled or it does not need a reload. */ - return; - } - - dpkg_sehandle = selabel_open(SELABEL_CTX_FILE, NULL, 0); - if (dpkg_sehandle == NULL) - ohshite(_("cannot get security labeling handle")); -#endif -} - -static void -dpkg_selabel_close(void) -{ -#ifdef WITH_SELINUX - if (dpkg_sehandle == NULL) - return; - - selinux_status_close(); - selabel_close(dpkg_sehandle); - dpkg_sehandle = NULL; -#endif -} - static void tarobject_set_se_context(const char *matchpath, const char *path, mode_t mode) { -#ifdef WITH_SELINUX - struct selabel_handle *sehandle; - security_context_t scontext = NULL; - int ret; - - /* If there's no file type, just give up. */ - if ((mode & S_IFMT) == 0) - return; - - /* If SELinux is not enabled just do nothing. */ - sehandle = dpkg_selabel_get_handle(); - if (sehandle == NULL) - return; - - /* - * We use the _raw function variants here so that no translation happens - * from computer to human readable forms, to avoid issues when mcstransd - * has disappeared during the unpack process. - */ - - /* Do nothing if we can't figure out what the context is, or if it has - * no context; in which case the default context shall be applied. */ - ret = selabel_lookup_raw(sehandle, &scontext, matchpath, mode & S_IFMT); - if (ret == -1 || (ret == 0 && scontext == NULL)) - return; - - ret = lsetfilecon_raw(path, scontext); - if (ret < 0 && errno != ENOTSUP) - ohshite(_("cannot set security context for file object '%s'"), path); - - freecon(scontext); -#endif /* WITH_SELINUX */ + dpkg_selabel_set_context(matchpath, path, mode); } static void diff --git a/src/main.h b/src/main.h index d319af9..101649c 100644 --- a/src/main.h +++ b/src/main.h @@ -275,6 +275,12 @@ bool dir_has_conffiles(struct filenamenode *namenode, struct pkginfo *pkg); void log_action(const char *action, struct pkginfo *pkg, struct pkgbin *pkgbin); +/* From selinux.c */ + +void dpkg_selabel_load(void); +void dpkg_selabel_set_context(const char *matchpath, const char *path, mode_t mode); +void dpkg_selabel_close(void); + /* from trigproc.c */ enum trigproc_type { diff --git a/src/selinux.c b/src/selinux.c new file mode 100644 index 0000000..7d32a38 --- /dev/null +++ b/src/selinux.c @@ -0,0 +1,139 @@ +/* + * dpkg - main program for package management + * selinux.c - SE Linux support + * + * Copyright © 2007-2014 Guillem Jover <[email protected]> + * + * This is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <https://www.gnu.org/licenses/>. + */ + +#include <config.h> +#include <compat.h> + +#include <sys/types.h> +#include <sys/stat.h> + +#include <errno.h> +#include <unistd.h> + +#include <dpkg/i18n.h> +#include <dpkg/dpkg.h> +#include <dpkg/dpkg-db.h> + +#ifdef WITH_SELINUX +#include <selinux/selinux.h> +#include <selinux/avc.h> +#include <selinux/label.h> +#endif + +#include "main.h" + +#ifdef WITH_SELINUX +static struct selabel_handle *dpkg_sehandle; + +static struct selabel_handle * +dpkg_selabel_get_handle(void) +{ + return dpkg_sehandle; +} +#endif + +void +dpkg_selabel_load(void) +{ +#ifdef WITH_SELINUX + static int selinux_enabled = -1; + + if (selinux_enabled < 0) { + int rc; + + /* Set selinux_enabled if it is not already set (singleton). */ + selinux_enabled = (is_selinux_enabled() > 0); + if (!selinux_enabled) + return; + + /* Open the SELinux status notification channel, with fallback + * enabled for older kernels. */ + rc = selinux_status_open(1); + if (rc < 0) + ohshit(_("cannot open security status notification channel")); + + /* XXX: We could use selinux_set_callback() to redirect the + * errors from the other SELinux calls, but that does not seem + * worth it right now. */ + } else if (selinux_enabled && selinux_status_updated()) { + /* The SELinux policy got updated in the kernel, usually after + * upgrading the package shipping it, we need to reload. */ + selabel_close(dpkg_sehandle); + } else { + /* SELinux is either disabled or it does not need a reload. */ + return; + } + + dpkg_sehandle = selabel_open(SELABEL_CTX_FILE, NULL, 0); + if (dpkg_sehandle == NULL) + ohshite(_("cannot get security labeling handle")); +#endif +} + +void +dpkg_selabel_set_context(const char *matchpath, const char *path, mode_t mode) +{ +#ifdef WITH_SELINUX + struct selabel_handle *sehandle; + security_context_t scontext = NULL; + int ret; + + /* If there's no file type, just give up. */ + if ((mode & S_IFMT) == 0) + return; + + /* If SELinux is not enabled just do nothing. */ + sehandle = dpkg_selabel_get_handle(); + if (sehandle == NULL) + return; + + /* + * We use the _raw function variants here so that no translation + * happens from computer to human readable forms, to avoid issues + * when mcstransd has disappeared during the unpack process. + */ + + /* Do nothing if we can't figure out what the context is, or if it has + * no context; in which case the default context shall be applied. */ + ret = selabel_lookup_raw(sehandle, &scontext, matchpath, mode & S_IFMT); + if (ret == -1 || (ret == 0 && scontext == NULL)) + return; + + ret = lsetfilecon_raw(path, scontext); + if (ret < 0 && errno != ENOTSUP) + ohshite(_("cannot set security context for file object '%s'"), + path); + + freecon(scontext); +#endif /* WITH_SELINUX */ +} + +void +dpkg_selabel_close(void) +{ +#ifdef WITH_SELINUX + if (dpkg_sehandle == NULL) + return; + + selinux_status_close(); + selabel_close(dpkg_sehandle); + dpkg_sehandle = NULL; +#endif +} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
