Received: from goalie.tycho.ncsc.mil (goalie [144.51.242.250]) by tarius.tycho.ncsc.mil (8.14.4/8.14.4) with ESMTP id t8K1Mddx018882 for ; Sat, 19 Sep 2015 21:22:39 -0400 Received: by wiclk2 with SMTP id lk2so70479398wic.1 for ; Sat, 19 Sep 2015 18:22:36 -0700 (PDT) From: Nir Soffer To: selinux@tycho.nsa.gov Subject: [PATCH] libselinux: Fix restorecon when path has no context Date: Sun, 20 Sep 2015 04:22:21 +0300 Message-Id: <1442712141-5736-1-git-send-email-nsoffer@redhat.com> List-Id: "Security-Enhanced Linux \(SELinux\) mailing list" List-Post: List-Help: When a path has no context, for example, when the file was created when selinux was disabled, selinux.restorecon(path) will fail: >>> selinux.restorecon('/etc/multipath.conf.new') Traceback (most recent call last): File "", line 1, in File "/usr/lib64/python2.7/site-packages/selinux/__init__.py", line 88, in restorecon status, oldcontext = lgetfilecon(path) OSError: [Errno 61] No data available This failure does not seems to be useful, as we can successfully match the context for this path using selinux.matchpathcon(), and set it successfully using selinux.chcon(). The failure is caused by trying to avoid the lsetfilecon() call if the current context is does not need update. This patch handles this specific error from lgetfilecon(), preventing this failure. Signed-off-by: Nir Soffer --- libselinux/src/selinuxswig_python.i | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libselinux/src/selinuxswig_python.i b/libselinux/src/selinuxswig_python.i index c9a2341..8cea18d 100644 --- a/libselinux/src/selinuxswig_python.i +++ b/libselinux/src/selinuxswig_python.i @@ -8,7 +8,7 @@ %pythoncode %{ -import shutil, os, stat +import shutil, os, errno, stat DISABLED = -1 PERMISSIVE = 0 @@ -26,7 +26,12 @@ def restorecon(path, recursive=False): status, context = matchpathcon(path, mode) if status == 0: - status, oldcontext = lgetfilecon(path) + try: + status, oldcontext = lgetfilecon(path) + except OSError as e: + if e.errno != errno.ENODATA: + raise + oldcontext = None if context != oldcontext: lsetfilecon(path, context) -- 2.4.3