mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

shadow: fix copydir operation with 'pseudo'

Browse Source 
Calling 'useradd' through pseudo on (at least) Ubuntu 20 creates
filesystem objects (.bashrc, .profile) with invalid attributes.  It
manifests as

| tar: ./home/.../.bashrc: Unknown file type; file ignored

or

| Copying files into the device: __populate_fs: ignoring entry ".bashrc"
| .bashrc: File not found by ext2_lookup while looking up ".bashrc"

when building the image.

This happens due to a bug in shadow which is caused by clobbering
fstatat() results.

(From OE-Core rev: 991f880e5cb3d30a1197711d44af2fdb1719ce82)

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Enrico Scholz
2024-03-18 14:58:26 +01:00
committed by Richard Purdie
parent 7588fe77a1
commit 7d530aa417
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch Normal file
View File

@@ -0,0 +1,39 @@
From af4b8cb780587aa736692a3baa76b60474f19c5d Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Date: Mon, 18 Mar 2024 12:14:21 +0100
Subject: [PATCH] lib/copydir:copy_entry(): use temporary stat buffer
There are no guarantees that fstatat() does not clobber the stat
buffer on errors.
Use a temporary buffer so that the following code sees correct
attributes of the source entry.
Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/974]
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
lib/copydir.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: shadow-4.14.2/lib/copydir.c
===================================================================
--- shadow-4.14.2.orig/lib/copydir.c
+++ shadow-4.14.2/lib/copydir.c
@@ -415,6 +415,7 @@ static int copy_entry (const struct path
{
int err = 0;
struct stat sb;
+ struct stat tmp_sb;
struct link_name *lp;
struct timespec mt[2];
@@ -436,7 +437,7 @@ static int copy_entry (const struct path
* If the destination already exists do nothing.
* This is after the copy_dir above to still iterate into subdirectories.
*/
- if (fstatat(dst->dirfd, dst->name, &sb, AT_SYMLINK_NOFOLLOW) != -1) {
+ if (fstatat(dst->dirfd, dst->name, &tmp_sb, AT_SYMLINK_NOFOLLOW) != -1) {
return 0;
}

1
meta/recipes-extended/shadow/shadow.inc
View File

@@ -12,6 +12,7 @@ DEPENDS = "virtual/crypt"
GITHUB_BASE_URI = "https://github.com/shadow-maint/shadow/releases"
SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BP}.tar.gz \
file://0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch \
${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
file://useradd \
"