From 3a5d2ee0f56d049927c4dcdd03e8e275ac03e20d Mon Sep 17 00:00:00 2001

From: Panu Matilainen <pmatilai@redhat.com>

Date: Mon, 8 Feb 2021 10:45:59 +0200

Subject: [PATCH 01/10] Clean up file unpack iteration logic a bit

Handle rpmfiNext() in the while-condition directly to make it more like

similar other constructs elsewhere, adjust for the end of iteration

code after the loop. Also take the file index from rpmfiNext() so

we don't need multiple calls to rpmfiFX() later.

---

 lib/fsm.c | 19 +++++++------------

 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/fsm.c b/lib/fsm.c

index 432bcbd90..f71b9bc1e 100644

--- a/lib/fsm.c

+++ b/lib/fsm.c

@@ -865,6 +865,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

     struct stat sb;

     int saveerrno = errno;

     int rc = 0;

+    int fx = -1;

     int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0;

     int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0;

     int firsthardlink = -1;

@@ -886,17 +887,8 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

     /* Detect and create directories not explicitly in package. */

     rc = fsmMkdirs(files, fs, plugins);

-    while (!rc) {

-	/* Read next payload header. */

-	rc = rpmfiNext(fi);

-

-	if (rc < 0) {

-	    if (rc == RPMERR_ITER_END)

-		rc = 0;

-	    break;

-	}

-

-	action = rpmfsGetAction(fs, rpmfiFX(fi));

+    while (!rc && (fx = rpmfiNext(fi)) >= 0) {

+	action = rpmfsGetAction(fs, fx);

 	skip = XFA_SKIPPING(action);

 	if (action != FA_TOUCH) {

 	    suffix = S_ISDIR(rpmfiFMode(fi)) ? NULL : tid;

@@ -920,7 +912,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

 	if (rc) {

 	    skip = 1;

 	} else {

-	    setFileState(fs, rpmfiFX(fi));

+	    setFileState(fs, fx);

 	}

         if (!skip) {

@@ -1022,6 +1014,9 @@ touch:

 	fpath = _free(fpath);

     }

+    if (!rc && fx != RPMERR_ITER_END)

+	rc = fx;

+

     rpmswAdd(rpmtsOp(ts, RPMTS_OP_UNCOMPRESS), fdOp(payload, FDSTAT_READ));

     rpmswAdd(rpmtsOp(ts, RPMTS_OP_DIGEST), fdOp(payload, FDSTAT_DIGEST));

-- 

2.34.1

From 3096acbddc57eb2b65c96aad1ed3524ea9d0cead Mon Sep 17 00:00:00 2001

From: Panu Matilainen <pmatilai@redhat.com>

Date: Wed, 10 Feb 2021 08:25:28 +0200

Subject: [PATCH 02/10] Drop unused filename variable

---

 lib/fsm.c | 2 --

 1 file changed, 2 deletions(-)

diff --git a/lib/fsm.c b/lib/fsm.c

index f71b9bc1e..8e6a6c08b 100644

--- a/lib/fsm.c

+++ b/lib/fsm.c

@@ -976,11 +976,9 @@ touch:

 	    /* On FA_TOUCH no hardlinks are created thus this is skipped. */

 	    /* we skip the hard linked file containing the content */

 	    /* write the content to the first used instead */

-	    char *fn = rpmfilesFN(files, firsthardlink);

 	    rc = rpmfiArchiveReadToFilePsm(fi, firstlinkfile, nodigest, psm);

 	    wfd_close(&firstlinkfile);

 	    firsthardlink = -1;

-	    free(fn);

 	}

         if (rc) {

-- 

2.34.1

From 9561315538f1fc4a5b207a43ac39805134e7153f Mon Sep 17 00:00:00 2001

From: Panu Matilainen <pmatilai@redhat.com>

Date: Wed, 10 Feb 2021 09:57:17 +0200

Subject: [PATCH 03/10] Don't update path info if rename failed on file commit

---

 lib/fsm.c | 16 +++++++++-------

 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/fsm.c b/lib/fsm.c

index 8e6a6c08b..138b55297 100644

--- a/lib/fsm.c

+++ b/lib/fsm.c

@@ -797,14 +797,16 @@ static int fsmCommit(char **path, rpmfi fi, rpmFileAction action, const char *su

 	/* Rename temporary to final file name if needed. */

 	if (dest != *path) {

 	    rc = fsmRename(*path, dest);

-	    if (!rc && nsuffix) {

-		char * opath = fsmFsPath(fi, NULL);

-		rpmlog(RPMLOG_WARNING, _("%s created as %s\n"),

-		       opath, dest);

-		free(opath);

+	    if (!rc) {

+		if (nsuffix) {

+		    char * opath = fsmFsPath(fi, NULL);

+		    rpmlog(RPMLOG_WARNING, _("%s created as %s\n"),

+			   opath, dest);

+		    free(opath);

+		}

+		free(*path);

+		*path = dest;

 	    }

-	    free(*path);

-	    *path = dest;

 	}

     }

-- 

2.34.1

From 73d090166a60c57484e4be40e46fcb07f026cbf8 Mon Sep 17 00:00:00 2001

From: Panu Matilainen <pmatilai@redhat.com>

Date: Thu, 27 Aug 2020 10:31:07 +0300

Subject: [PATCH 04/10] Upgrade FA_TOUCH to FA_CREATE if the file went away

 (RhBug:1872141)

When %_minimize_writes is enabled, we determine unchanged files during

fingerprinting and only update their metadata (FA_TOUCH) instead of

always recreating from scratch (FA_CREATE) during install. However

package scriptlets (and administrators) can and will do arbitrary stuff

in the meanwhile, such as rm -f their own files in %pre, hoping to

get a fresh copy of contents no matter what. Or something.

Now, if the file was determined to not need changing by rpm, this will

just fail with chown & friends trying to touch non-existent file.

One can consider this a case of package shooting itself in the foot, but

when a package update fails or succeeds depending on %_minimize_writes this

to me suggests the feature is at fault as much as the package.

Do fsmVerify() on all files to be FA_TOUCH'ed to detect files whose

type changed or were removed since fingerprinting. This still doesn't

ensure correctness if something tampers with the contents in the meanwhile,

(for that we'd need to run the file through the whole machinery again,

checksumming and all) but covers the most glaring cases.

---

 lib/fsm.c                      | 15 ++++++---

 tests/Makefile.am              |  1 +

 tests/data/SPECS/suicidal.spec | 19 ++++++++++++

 tests/rpmi.at                  | 56 ++++++++++++++++++++++++++++++++++

 4 files changed, 87 insertions(+), 4 deletions(-)

 create mode 100644 tests/data/SPECS/suicidal.spec

diff --git a/lib/fsm.c b/lib/fsm.c

index 138b55297..8a4ecaf05 100644

--- a/lib/fsm.c

+++ b/lib/fsm.c

@@ -920,10 +920,6 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

         if (!skip) {

 	    int setmeta = 1;

-	    /* When touching we don't need any of this... */

-	    if (action == FA_TOUCH)

-		goto touch;

-

 	    /* Directories replacing something need early backup */

 	    if (!suffix) {

 		rc = fsmBackup(fi, action);

@@ -935,6 +931,17 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

 		rc = RPMERR_ENOENT;

 	    }

+	    /* See if the file was removed while our attention was elsewhere */

+	    if (rc == RPMERR_ENOENT && action == FA_TOUCH) {

+		rpmlog(RPMLOG_DEBUG, "file %s vanished unexpectedly\n", fpath);

+		action = FA_CREATE;

+		fsmDebug(fpath, action, &sb);

+	    }

+

+	    /* When touching we don't need any of this... */

+	    if (action == FA_TOUCH)

+		goto touch;

+

             if (S_ISREG(sb.st_mode)) {

 		if (rc == RPMERR_ENOENT) {

 		    rc = fsmMkfile(fi, fpath, files, psm, nodigest,

diff --git a/tests/Makefile.am b/tests/Makefile.am

index 7a6641d4f..d540e2a7b 100644

--- a/tests/Makefile.am

+++ b/tests/Makefile.am

@@ -59,6 +59,7 @@ EXTRA_DIST += data/SPECS/verifyscript.spec

 EXTRA_DIST += data/SPECS/fakeshell.spec

 EXTRA_DIST += data/SPECS/scripts.spec

 EXTRA_DIST += data/SPECS/selfconflict.spec

+EXTRA_DIST += data/SPECS/suicidal.spec

 EXTRA_DIST += data/SPECS/replacetest.spec

 EXTRA_DIST += data/SPECS/triggers.spec

 EXTRA_DIST += data/SPECS/filetriggers.spec

diff --git a/tests/data/SPECS/suicidal.spec b/tests/data/SPECS/suicidal.spec

new file mode 100644

index 000000000..77d17d8c9

--- /dev/null

+++ b/tests/data/SPECS/suicidal.spec

@@ -0,0 +1,19 @@

+Name: suicidal

+Version: 1

+Release: %{rel}

+License: GPL

+Group: Testing

+Summary: Testing suicidal package behavior

+BuildArch: noarch

+

+%description

+

+%build

+mkdir -p %{buildroot}/opt

+echo shoot > %{buildroot}/opt/foot

+

+%pre -p <lua>

+os.remove('/opt/foot')

+

+%files

+/opt/foot

diff --git a/tests/rpmi.at b/tests/rpmi.at

index e8d6e9b7a..71e17821b 100644

--- a/tests/rpmi.at

+++ b/tests/rpmi.at

@@ -711,3 +711,59 @@ runroot rpm -e testdoc

 [])

 AT_CLEANUP

+AT_SETUP([rpm -i --excludeartifacts])

+AT_KEYWORDS([install])

+RPMDB_INIT

+runroot rpmbuild --quiet -bb /data/SPECS/vattrtest.spec

+

+AT_CHECK([

+RPMDB_INIT

+runroot rpm -i --excludeartifacts /build/RPMS/noarch/vattrtest-1.0-1.noarch.rpm

+test -e ${RPMTEST}/opt/vattrtest/a && exit 1

+runroot rpm -e vattrtest

+runroot rpm -i /build/RPMS/noarch/vattrtest-1.0-1.noarch.rpm

+test -e ${RPMTEST}/opt/vattrtest/a || exit 1

+],

+[0],

+[],

+[])

+AT_CLEANUP

+

+AT_SETUP([rpm -U <suicidal>])

+AT_KEYWORDS([install])

+RPMDB_INIT

+

+for r in 1 2; do

+    runroot rpmbuild -bb --quiet \

+		--define "rel ${r}" \

+		/data/SPECS/suicidal.spec

+done

+

+AT_CHECK([

+RPMDB_INIT

+

+for r in 1 2; do

+    runroot rpm -U \

+	--define "_minimize_writes 0" \

+	/build/RPMS/noarch/suicidal-1-${r}.noarch.rpm

+done

+runroot rpm -V --nouser --nogroup suicidal

+],

+[0],

+[],

+[])

+

+AT_CHECK([

+RPMDB_INIT

+

+for r in 1 2; do

+    runroot rpm -U \

+	--define "_minimize_writes 1" \

+	/build/RPMS/noarch/suicidal-1-${r}.noarch.rpm

+done

+runroot rpm -V --nouser --nogroup suicidal

+],

+[0],

+[],

+[])

+AT_CLEANUP

-- 

2.34.1

From e78ea489eeed84cdee9f5cedcbbf35cfcf1a70b6 Mon Sep 17 00:00:00 2001

From: Panu Matilainen <pmatilai@redhat.com>

Date: Wed, 10 Feb 2021 09:47:19 +0200

Subject: [PATCH 05/10] Refactor file install and remove around a common struct

Collect the common state info into a struct shared by both file install

and remove, update code accordingly. The change looks much more drastic

than it is - it's just adding fp-> prefix to a lot of places.

While we're at it, remember the state data throughout the operation.

No functional changes here, just paving way for the next steps which

will look clearer with these pre-requisites in place.

---

 lib/fsm.c | 158 +++++++++++++++++++++++++++++-------------------------

 1 file changed, 85 insertions(+), 73 deletions(-)

diff --git a/lib/fsm.c b/lib/fsm.c

index 8a4ecaf05..ab15c2bf3 100644

--- a/lib/fsm.c

+++ b/lib/fsm.c

@@ -38,6 +38,14 @@ static int strict_erasures = 0;

 #define _dirPerms 0755

 #define _filePerms 0644

+struct filedata_s {

+    int skip;

+    rpmFileAction action;

+    const char *suffix;

+    char *fpath;

+    struct stat sb;

+};

+

 /* 

  * XXX Forward declarations for previously exported functions to avoid moving 

  * things around needlessly 

@@ -864,19 +872,16 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

     rpmfi fi = rpmfiNewArchiveReader(payload, files, RPMFI_ITER_READ_ARCHIVE);

     rpmfs fs = rpmteGetFileStates(te);

     rpmPlugins plugins = rpmtsPlugins(ts);

-    struct stat sb;

     int saveerrno = errno;

     int rc = 0;

     int fx = -1;

+    int fc = rpmfilesFC(files);

     int nodigest = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOFILEDIGEST) ? 1 : 0;

     int nofcaps = (rpmtsFlags(ts) & RPMTRANS_FLAG_NOCAPS) ? 1 : 0;

     int firsthardlink = -1;

     FD_t firstlinkfile = NULL;

-    int skip;

-    rpmFileAction action;

     char *tid = NULL;

-    const char *suffix;

-    char *fpath = NULL;

+    struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata));

     if (fi == NULL) {

 	rc = RPMERR_BAD_MAGIC;

@@ -890,96 +895,99 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

     rc = fsmMkdirs(files, fs, plugins);

     while (!rc && (fx = rpmfiNext(fi)) >= 0) {

-	action = rpmfsGetAction(fs, fx);

-	skip = XFA_SKIPPING(action);

-	if (action != FA_TOUCH) {

-	    suffix = S_ISDIR(rpmfiFMode(fi)) ? NULL : tid;

+	struct filedata_s *fp = &fdata[fx];

+	fp->action = rpmfsGetAction(fs, fx);

+	fp->skip = XFA_SKIPPING(fp->action);

+	if (fp->action != FA_TOUCH) {

+	    fp->suffix = S_ISDIR(rpmfiFMode(fi)) ? NULL : tid;

 	} else {

-	    suffix = NULL;

+	    fp->suffix = NULL;

 	}

-	fpath = fsmFsPath(fi, suffix);

+	fp->fpath = fsmFsPath(fi, fp->suffix);

 	/* Remap file perms, owner, and group. */

-	rc = rpmfiStat(fi, 1, &sb);

+	rc = rpmfiStat(fi, 1, &fp->sb);

-	fsmDebug(fpath, action, &sb);

+	fsmDebug(fp->fpath, fp->action, &fp->sb);

         /* Exit on error. */

         if (rc)

             break;

 	/* Run fsm file pre hook for all plugins */

-	rc = rpmpluginsCallFsmFilePre(plugins, fi, fpath,

-				      sb.st_mode, action);

+	rc = rpmpluginsCallFsmFilePre(plugins, fi, fp->fpath,

+				      fp->sb.st_mode, fp->action);

 	if (rc) {

-	    skip = 1;

+	    fp->skip = 1;

 	} else {

 	    setFileState(fs, fx);

 	}

-        if (!skip) {

+        if (!fp->skip) {

 	    int setmeta = 1;

 	    /* Directories replacing something need early backup */

-	    if (!suffix) {

-		rc = fsmBackup(fi, action);

+	    if (!fp->suffix) {

+		rc = fsmBackup(fi, fp->action);

 	    }

 	    /* Assume file does't exist when tmp suffix is in use */

-	    if (!suffix) {

-		rc = fsmVerify(fpath, fi);

+	    if (!fp->suffix) {

+		rc = fsmVerify(fp->fpath, fi);

 	    } else {

 		rc = RPMERR_ENOENT;

 	    }

 	    /* See if the file was removed while our attention was elsewhere */

-	    if (rc == RPMERR_ENOENT && action == FA_TOUCH) {

-		rpmlog(RPMLOG_DEBUG, "file %s vanished unexpectedly\n", fpath);

-		action = FA_CREATE;

-		fsmDebug(fpath, action, &sb);

+	    if (rc == RPMERR_ENOENT && fp->action == FA_TOUCH) {

+		rpmlog(RPMLOG_DEBUG, "file %s vanished unexpectedly\n",

+			fp->fpath);

+		fp->action = FA_CREATE;

+		fsmDebug(fp->fpath, fp->action, &fp->sb);

 	    }

 	    /* When touching we don't need any of this... */

-	    if (action == FA_TOUCH)

+	    if (fp->action == FA_TOUCH)

 		goto touch;

-            if (S_ISREG(sb.st_mode)) {

+            if (S_ISREG(fp->sb.st_mode)) {

 		if (rc == RPMERR_ENOENT) {

-		    rc = fsmMkfile(fi, fpath, files, psm, nodigest,

+		    rc = fsmMkfile(fi, fp->fpath, files, psm, nodigest,

 				   &setmeta, &firsthardlink, &firstlinkfile);

 		}

-            } else if (S_ISDIR(sb.st_mode)) {

+            } else if (S_ISDIR(fp->sb.st_mode)) {

                 if (rc == RPMERR_ENOENT) {

-                    mode_t mode = sb.st_mode;

+                    mode_t mode = fp->sb.st_mode;

                     mode &= ~07777;

                     mode |=  00700;

-                    rc = fsmMkdir(fpath, mode);

+                    rc = fsmMkdir(fp->fpath, mode);

                 }

-            } else if (S_ISLNK(sb.st_mode)) {

+            } else if (S_ISLNK(fp->sb.st_mode)) {

 		if (rc == RPMERR_ENOENT) {

-		    rc = fsmSymlink(rpmfiFLink(fi), fpath);

+		    rc = fsmSymlink(rpmfiFLink(fi), fp->fpath);

 		}

-            } else if (S_ISFIFO(sb.st_mode)) {

+            } else if (S_ISFIFO(fp->sb.st_mode)) {

                 /* This mimics cpio S_ISSOCK() behavior but probably isn't right */

                 if (rc == RPMERR_ENOENT) {

-                    rc = fsmMkfifo(fpath, 0000);

+                    rc = fsmMkfifo(fp->fpath, 0000);

                 }

-            } else if (S_ISCHR(sb.st_mode) ||

-                       S_ISBLK(sb.st_mode) ||

-                       S_ISSOCK(sb.st_mode))

+            } else if (S_ISCHR(fp->sb.st_mode) ||

+                       S_ISBLK(fp->sb.st_mode) ||

+                       S_ISSOCK(fp->sb.st_mode))

             {

                 if (rc == RPMERR_ENOENT) {

-                    rc = fsmMknod(fpath, sb.st_mode, sb.st_rdev);

+                    rc = fsmMknod(fp->fpath, fp->sb.st_mode, fp->sb.st_rdev);

                 }

             } else {

                 /* XXX Special case /dev/log, which shouldn't be packaged anyways */

-                if (!IS_DEV_LOG(fpath))

+                if (!IS_DEV_LOG(fp->fpath))

                     rc = RPMERR_UNKNOWN_FILETYPE;

             }

 touch:

 	    /* Set permissions, timestamps etc for non-hardlink entries */

 	    if (!rc && setmeta) {

-		rc = fsmSetmeta(fpath, fi, plugins, action, &sb, nofcaps);

+		rc = fsmSetmeta(fp->fpath, fi, plugins, fp->action,

+				&fp->sb, nofcaps);

 	    }

         } else if (firsthardlink >= 0 && rpmfiArchiveHasContent(fi)) {

 	    /* On FA_TOUCH no hardlinks are created thus this is skipped. */

@@ -991,10 +999,10 @@ touch:

 	}

         if (rc) {

-            if (!skip) {

+            if (!fp->skip) {

                 /* XXX only erase if temp fn w suffix is in use */

-                if (suffix) {

-		    (void) fsmRemove(fpath, sb.st_mode);

+                if (fp->suffix) {

+		    (void) fsmRemove(fp->fpath, fp->sb.st_mode);

                 }

                 errno = saveerrno;

             }

@@ -1002,23 +1010,22 @@ touch:

 	    /* Notify on success. */

 	    rpmpsmNotify(psm, RPMCALLBACK_INST_PROGRESS, rpmfiArchiveTell(fi));

-	    if (!skip) {

+	    if (!fp->skip) {

 		/* Backup file if needed. Directories are handled earlier */

-		if (suffix)

-		    rc = fsmBackup(fi, action);

+		if (fp->suffix)

+		    rc = fsmBackup(fi, fp->action);

 		if (!rc)

-		    rc = fsmCommit(&fpath, fi, action, suffix);

+		    rc = fsmCommit(&fp->fpath, fi, fp->action, fp->suffix);

 	    }

 	}

 	if (rc)

-	    *failedFile = xstrdup(fpath);

+	    *failedFile = xstrdup(fp->fpath);

 	/* Run fsm file post hook for all plugins */

-	rpmpluginsCallFsmFilePost(plugins, fi, fpath,

-				  sb.st_mode, action, rc);

-	fpath = _free(fpath);

+	rpmpluginsCallFsmFilePost(plugins, fi, fp->fpath,

+				  fp->sb.st_mode, fp->action, rc);

     }

     if (!rc && fx != RPMERR_ITER_END)

@@ -1034,7 +1041,9 @@ exit:

     rpmfiFree(fi);

     Fclose(payload);

     free(tid);

-    free(fpath);

+    for (int i = 0; i < fc; i++)

+	free(fdata[i].fpath);

+    free(fdata);

     return rc;

 }

@@ -1046,29 +1055,31 @@ int rpmPackageFilesRemove(rpmts ts, rpmte te, rpmfiles files,

     rpmfi fi = rpmfilesIter(files, RPMFI_ITER_BACK);

     rpmfs fs = rpmteGetFileStates(te);

     rpmPlugins plugins = rpmtsPlugins(ts);

-    struct stat sb;

+    int fc = rpmfilesFC(files);

+    int fx = -1;

+    struct filedata_s *fdata = xcalloc(fc, sizeof(*fdata));

     int rc = 0;

-    char *fpath = NULL;

-    while (!rc && rpmfiNext(fi) >= 0) {

-	rpmFileAction action = rpmfsGetAction(fs, rpmfiFX(fi));

-	fpath = fsmFsPath(fi, NULL);

-	rc = fsmStat(fpath, 1, &sb);

+    while (!rc && (fx = rpmfiNext(fi)) >= 0) {

+	struct filedata_s *fp = &fdata[fx];

+	fp->action = rpmfsGetAction(fs, rpmfiFX(fi));

+	fp->fpath = fsmFsPath(fi, NULL);

+	rc = fsmStat(fp->fpath, 1, &fp->sb);

-	fsmDebug(fpath, action, &sb);

+	fsmDebug(fp->fpath, fp->action, &fp->sb);

 	/* Run fsm file pre hook for all plugins */

-	rc = rpmpluginsCallFsmFilePre(plugins, fi, fpath,

-				      sb.st_mode, action);

+	rc = rpmpluginsCallFsmFilePre(plugins, fi, fp->fpath,

+				      fp->sb.st_mode, fp->action);

-	if (!XFA_SKIPPING(action))

-	    rc = fsmBackup(fi, action);

+	if (!XFA_SKIPPING(fp->action))

+	    rc = fsmBackup(fi, fp->action);

         /* Remove erased files. */

-        if (action == FA_ERASE) {

+        if (fp->action == FA_ERASE) {

 	    int missingok = (rpmfiFFlags(fi) & (RPMFILE_MISSINGOK | RPMFILE_GHOST));

-	    rc = fsmRemove(fpath, sb.st_mode);

+	    rc = fsmRemove(fp->fpath, fp->sb.st_mode);

 	    /*

 	     * Missing %ghost or %missingok entries are not errors.

@@ -1093,20 +1104,20 @@ int rpmPackageFilesRemove(rpmts ts, rpmte te, rpmfiles files,

 	    if (rc) {

 		int lvl = strict_erasures ? RPMLOG_ERR : RPMLOG_WARNING;

 		rpmlog(lvl, _("%s %s: remove failed: %s\n"),

-			S_ISDIR(sb.st_mode) ? _("directory") : _("file"),

-			fpath, strerror(errno));

+			S_ISDIR(fp->sb.st_mode) ? _("directory") : _("file"),

+			fp->fpath, strerror(errno));

             }

         }

 	/* Run fsm file post hook for all plugins */

-	rpmpluginsCallFsmFilePost(plugins, fi, fpath,

-				  sb.st_mode, action, rc);

+	rpmpluginsCallFsmFilePost(plugins, fi, fp->fpath,

+				  fp->sb.st_mode, fp->action, rc);

         /* XXX Failure to remove is not (yet) cause for failure. */

         if (!strict_erasures) rc = 0;

 	if (rc)

-	    *failedFile = xstrdup(fpath);

+	    *failedFile = xstrdup(fp->fpath);

 	if (rc == 0) {

 	    /* Notify on success. */

@@ -1114,10 +1125,11 @@ int rpmPackageFilesRemove(rpmts ts, rpmte te, rpmfiles files,

 	    rpm_loff_t amount = rpmfiFC(fi) - rpmfiFX(fi);

 	    rpmpsmNotify(psm, RPMCALLBACK_UNINST_PROGRESS, amount);

 	}

-	fpath = _free(fpath);

     }

-    free(fpath);

+    for (int i = 0; i < fc; i++)

+	free(fdata[i].fpath);

+    free(fdata);

     rpmfiFree(fi);

     return rc;

-- 

2.34.1

From 215525131b0e4e015d83c25828700d7531fec6dd Mon Sep 17 00:00:00 2001

From: Panu Matilainen <pmatilai@redhat.com>

Date: Wed, 10 Feb 2021 10:08:27 +0200

Subject: [PATCH 06/10] Refactor fsmMkfile() to take advantage of the new state

 struct

Move setmeta into the struct too (we'll want this later anyhow),

and now we only need to pass the struct to fsmMkfile(). One less

argument to pass around, it has way too many still.

No functional changes.

---

 lib/fsm.c | 22 +++++++++++-----------

 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/fsm.c b/lib/fsm.c

index ab15c2bf3..6c873206c 100644

--- a/lib/fsm.c

+++ b/lib/fsm.c

@@ -39,6 +39,7 @@ static int strict_erasures = 0;

 #define _filePerms 0644

 struct filedata_s {

+    int setmeta;

     int skip;

     rpmFileAction action;

     const char *suffix;

@@ -279,8 +280,8 @@ exit:

     return rc;

 }

-static int fsmMkfile(rpmfi fi, const char *dest, rpmfiles files,

-		     rpmpsm psm, int nodigest, int *setmeta,

+static int fsmMkfile(rpmfi fi, struct filedata_s *fp, rpmfiles files,

+		     rpmpsm psm, int nodigest,

 		     int * firsthardlink, FD_t *firstlinkfile)

 {

     int rc = 0;

@@ -290,11 +291,11 @@ static int fsmMkfile(rpmfi fi, const char *dest, rpmfiles files,

 	/* Create first hardlinked file empty */

 	if (*firsthardlink < 0) {

 	    *firsthardlink = rpmfiFX(fi);

-	    rc = wfd_open(firstlinkfile, dest);

+	    rc = wfd_open(firstlinkfile, fp->fpath);

 	} else {

 	    /* Create hard links for others */

 	    char *fn = rpmfilesFN(files, *firsthardlink);

-	    rc = link(fn, dest);

+	    rc = link(fn, fp->fpath);

 	    if (rc < 0) {

 		rc = RPMERR_LINK_FAILED;

 	    }

@@ -305,14 +306,14 @@ static int fsmMkfile(rpmfi fi, const char *dest, rpmfiles files,

        existing) file with content */

     if (numHardlinks<=1) {

 	if (!rc)

-	    rc = expandRegular(fi, dest, psm, nodigest);

+	    rc = expandRegular(fi, fp->fpath, psm, nodigest);

     } else if (rpmfiArchiveHasContent(fi)) {

 	if (!rc)

 	    rc = rpmfiArchiveReadToFilePsm(fi, *firstlinkfile, nodigest, psm);

 	wfd_close(firstlinkfile);

 	*firsthardlink = -1;

     } else {

-	*setmeta = 0;

+	fp->setmeta = 0;

     }

     return rc;

@@ -898,6 +899,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,

 	struct filedata_s *fp = &fdata[fx];

 	fp->action = rpmfsGetAction(fs, fx);

 	fp->skip = XFA_SKIPPING(fp->action);