Attachment 577219 Details for Bug 811363 – lua script chroot v1.1

[patch] lua script chroot v1.1

rpm-4.8.0-lua-chroot.patch (text/plain), 1.86 KB, created by Chris Seawood on 2012-04-13 03:53:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Seawood

Created: 2012-04-13 03:53:39 UTC

Size: 1.86 KB

patch

obsolete

>diff -up rpm-4.8.0/lib/psm.c.lua-chroot rpm-4.8.0/lib/psm.c
>--- rpm-4.8.0/lib/psm.c.lua-chroot	2012-04-12 16:14:27.343163957 -0700
>+++ rpm-4.8.0/lib/psm.c	2012-04-12 17:12:13.379020257 -0700
>@@ -454,25 +454,31 @@ static rpmRC runLuaScript(rpmpsm psm, He
>     const rpmts ts = psm->ts;
> #ifdef WITH_LUA
>     char *sname = NULL;
>-    int rootFd = -1;
>     int xx;
>     rpmlua lua = NULL; /* Global state. */
>     rpmluav var;
>     mode_t oldmask;
>+    int useChroot = 0;
>+    char currentPath[PATH_MAX];
>+    const char *rootDir = rpmtsRootDir(ts);
> 
>     rasprintf(&sname, "%s(%s)", tag2sln(stag), rpmteNEVRA(psm->te));
> 
>     rpmlog(RPMLOG_DEBUG, "%s: %s running <lua> scriptlet.\n",
> 	   psm->stepName, sname);
>+
>+    memset(currentPath, 0, PATH_MAX);
>+    (void)getcwd(currentPath, PATH_MAX);
>+
>+    if (rootDir != NULL && !rstreq(rootDir, "/") &&
>+        !(rootDir[0] == '/' && rootDir[1] == '\0')) {
>+        useChroot = 1;
>+    }
>     if (!rpmtsChrootDone(ts)) {
>-	const char *rootDir = rpmtsRootDir(ts);
>-	xx = chdir("/");
>-	rootFd = open(".", O_RDONLY, 0);
>-	if (rootFd >= 0) {
>-	    if (rootDir != NULL && !rstreq(rootDir, "/") && *rootDir == '/')
>-		xx = chroot(rootDir);
>-	    xx = rpmtsSetChrootDone(ts, 1);
>-	}
>+        if (useChroot)
>+            xx = chroot(rootDir);
>+        xx = chdir("/");
>+        xx = rpmtsSetChrootDone(ts, 1);
>     }
> 
>     /* Create arg variable */
>@@ -510,12 +516,11 @@ static rpmRC runLuaScript(rpmpsm psm, He
> 
>     rpmluaDelVar(lua, "arg");
> 
>-    if (rootFd >= 0) {
>-	const char *rootDir = rpmtsRootDir(ts);
>-	xx = fchdir(rootFd);
>-	xx = close(rootFd);
>-	if (rootDir != NULL && !rstreq(rootDir, "/") && *rootDir == '/')
>-	    xx = chroot(".");
>+    if (rpmtsChrootDone(ts)) {
>+        if (useChroot)
>+            xx = chroot(".");
>+        if (*currentPath)
>+            xx = chdir(currentPath);
> 	xx = rpmtsSetChrootDone(ts, 0);
>     }
>     free(sname);

Actions: View | Diff

Attachments on bug 811363: 576575 | 576576 | 576577 | 577219