Attachment 576577 Details for Bug 811363 – fix chroot handling for lua scripts

[patch] fix chroot handling for lua scripts

rpm-4.8.0-lua-chroot.patch (text/plain), 1.72 KB, created by Chris Seawood on 2012-04-10 19:53:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Seawood

Created: 2012-04-10 19:53:07 UTC

Size: 1.72 KB

patch

obsolete

>diff -up rpm-4.8.0/lib/psm.c.cls rpm-4.8.0/lib/psm.c
>--- rpm-4.8.0/lib/psm.c.cls	2012-04-10 12:08:01.598236003 -0700
>+++ rpm-4.8.0/lib/psm.c	2012-04-10 12:27:01.544672045 -0700
>@@ -454,7 +454,6 @@ 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;
>@@ -466,13 +465,13 @@ static rpmRC runLuaScript(rpmpsm psm, He
> 	   psm->stepName, sname);
>     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 (rootDir != NULL && !rstreq(rootDir, "/") &&
>+            !(rootDir[0] == '/' && rootDir[1] == '\0'))
>+        {
>+            xx = chroot(rootDir);
>+        }
>+        xx = chdir("/");
>+        xx = rpmtsSetChrootDone(ts, 1);
>     }
> 
>     /* Create arg variable */
>@@ -510,12 +509,16 @@ static rpmRC runLuaScript(rpmpsm psm, He
> 
>     rpmluaDelVar(lua, "arg");
> 
>-    if (rootFd >= 0) {
>+    if (rpmtsChrootDone(ts)) {
> 	const char *rootDir = rpmtsRootDir(ts);
>-	xx = fchdir(rootFd);
>-	xx = close(rootFd);
>-	if (rootDir != NULL && !rstreq(rootDir, "/") && *rootDir == '/')
>-	    xx = chroot(".");
>+        const char *currDir = rpmtsCurrDir(ts);
>+        if (rootDir != NULL && !rstreq(rootDir, "/") &&
>+            !(rootDir[0] == '/' && rootDir[1] == '\0'))
>+        {
>+            xx = chroot(".");
>+        }
>+        if (currDir != NULL)	/* XXX can't happen */
>+            xx = chdir(currDir);
> 	xx = rpmtsSetChrootDone(ts, 0);
>     }
>     free(sname);

Actions: View | Diff

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