diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2024-05-20 16:10:38 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-22 10:21:26 +0100 |
| commit | bdf0866eef08acdfc191d6705f4e6668870b5f69 (patch) | |
| tree | 5fbd2580b97dc89adf62ab7954b3da4a5aca0337 /meta/recipes-extended/shadow/files | |
| parent | 060bc9d4d4e0bb31c40a2fe229a495113dd4e70b (diff) | |
| download | poky-bdf0866eef08acdfc191d6705f4e6668870b5f69.tar.gz | |
shadow: upgrade from 4.15.0 to 4.15.1
0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch is dropped
as it has been merged and is in this new release.
(From OE-Core rev: 921b010e6e4b3a61779d8c10eb38966560f665f5)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/shadow/files')
| -rw-r--r-- | meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch b/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch deleted file mode 100644 index 2e5503bfd4..0000000000 --- a/meta/recipes-extended/shadow/files/0001-lib-copydir-copy_entry-use-temporary-stat-buffer.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | From af4b8cb780587aa736692a3baa76b60474f19c5d Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | ||
| 3 | Date: Mon, 18 Mar 2024 12:14:21 +0100 | ||
| 4 | Subject: [PATCH] lib/copydir:copy_entry(): use temporary stat buffer | ||
| 5 | |||
| 6 | There are no guarantees that fstatat() does not clobber the stat | ||
| 7 | buffer on errors. | ||
| 8 | |||
| 9 | Use a temporary buffer so that the following code sees correct | ||
| 10 | attributes of the source entry. | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://github.com/shadow-maint/shadow/pull/974] | ||
| 13 | |||
| 14 | Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | ||
| 15 | --- | ||
| 16 | lib/copydir.c | 3 ++- | ||
| 17 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | --- a/lib/copydir.c | ||
| 20 | +++ b/lib/copydir.c | ||
| 21 | @@ -400,6 +400,7 @@ static int copy_entry (const struct path | ||
| 22 | { | ||
| 23 | int err = 0; | ||
| 24 | struct stat sb; | ||
| 25 | + struct stat tmp_sb; | ||
| 26 | struct link_name *lp; | ||
| 27 | struct timespec mt[2]; | ||
| 28 | |||
| 29 | @@ -423,7 +424,7 @@ static int copy_entry (const struct path | ||
| 30 | * If the destination already exists do nothing. | ||
| 31 | * This is after the copy_dir above to still iterate into subdirectories. | ||
| 32 | */ | ||
| 33 | - if (fstatat(dst->dirfd, dst->name, &sb, AT_SYMLINK_NOFOLLOW) != -1) { | ||
| 34 | + if (fstatat(dst->dirfd, dst->name, &tmp_sb, AT_SYMLINK_NOFOLLOW) != -1) { | ||
| 35 | return err; | ||
| 36 | } | ||
| 37 | |||
