Merge pull request #1920 from eriksjolund/handle_open_error

giuseppe · web-flow · commit 357d650f02eb · 2025-12-09T09:50:37.000+01:00
linux: handle openat error
diff --git a/src/libcrun/linux.c b/src/libcrun/linux.c
@@ -2662,9 +2662,11 @@ make_parent_mount_private (const char *rootfs, libcrun_error_t *err)
       parentfd = openat (rootfsfd, "..", O_PATH | O_CLOEXEC);
       if (parentfd < 0)
         {
+          int saved_errno = errno;
           ret = faccessat (rootfsfd, "..", X_OK, AT_EACCESS);
           if (ret != 0)
             return crun_make_error (err, EACCES, "make `%s` private: a component is not accessible", rootfs);
+          return crun_make_error (err, saved_errno, "make `%s` private: cannot open component", rootfs);
         }
 
       close_and_reset (&rootfsfd);

Original file line number	Diff line number	Diff line change
`@@ -2662,9 +2662,11 @@ make_parent_mount_private (const char rootfs, libcrun_error_t err)`
`2662`	`2662`	`parentfd = openat (rootfsfd, "..", O_PATH \| O_CLOEXEC);`
`2663`	`2663`	`if (parentfd < 0)`
`2664`	`2664`	`{`
	`2665`	`+ int saved_errno = errno;`
`2665`	`2666`	`ret = faccessat (rootfsfd, "..", X_OK, AT_EACCESS);`
`2666`	`2667`	`if (ret != 0)`
`2667`	`2668`	return crun_make_error (err, EACCES, "make `%s` private: a component is not accessible", rootfs);
	`2669`	+ return crun_make_error (err, saved_errno, "make `%s` private: cannot open component", rootfs);
`2668`	`2670`	`}`
`2669`	`2671`
`2670`	`2672`	`close_and_reset (&rootfsfd);`