diff options
author | Vijay Anusuri <vanusuri@mvista.com> | 2024-01-16 07:35:36 +0530 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2024-01-21 08:33:19 -1000 |
commit | 854aafaea449e5808c0cc2ddf02088511cd3defb (patch) | |
tree | f9952e297ac8dc6edfbdbf8788f81396de962c20 /meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch | |
parent | 7e3b27865d62ecf75ec3b374888d9bafd7e7f5fc (diff) | |
download | poky-854aafaea449e5808c0cc2ddf02088511cd3defb.tar.gz |
qemu: Backport fix for CVE-2023-2861
Updated 0012-fix-libcap-header-issue-on-some-distro.patch to resolve
patch fuzz caused by the CVE-2023-2861 patch
Upstream-Status: Backport
[https://gitlab.com/qemu-project/qemu/-/commit/a5804fcf7b22fc7d1f9ec794dd284c7d504bd16b
&
https://gitlab.com/qemu-project/qemu/-/commit/f6b0de53fb87ddefed348a39284c8e2f28dc4eda]
(From OE-Core rev: cede843cdd1d1a83b2d616086aa69a2b584f9442)
Signed-off-by: Vijay Anusuri <vanusuri@mvista.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch b/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch index 3a7d7bbd33..3789f1edea 100644 --- a/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch +++ b/meta/recipes-devtools/qemu/qemu/0012-fix-libcap-header-issue-on-some-distro.patch | |||
@@ -60,7 +60,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
60 | 1 file changed, 5 insertions(+), 2 deletions(-) | 60 | 1 file changed, 5 insertions(+), 2 deletions(-) |
61 | 61 | ||
62 | diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c | 62 | diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c |
63 | index 6f132c5f..8329950c 100644 | 63 | index 300c9765..2823db7d 100644 |
64 | --- a/fsdev/virtfs-proxy-helper.c | 64 | --- a/fsdev/virtfs-proxy-helper.c |
65 | +++ b/fsdev/virtfs-proxy-helper.c | 65 | +++ b/fsdev/virtfs-proxy-helper.c |
66 | @@ -13,7 +13,6 @@ | 66 | @@ -13,7 +13,6 @@ |
@@ -71,9 +71,9 @@ index 6f132c5f..8329950c 100644 | |||
71 | #include <sys/fsuid.h> | 71 | #include <sys/fsuid.h> |
72 | #include <sys/vfs.h> | 72 | #include <sys/vfs.h> |
73 | #include <sys/ioctl.h> | 73 | #include <sys/ioctl.h> |
74 | @@ -27,7 +26,11 @@ | 74 | @@ -28,7 +27,11 @@ |
75 | #include "9p-iov-marshal.h" | ||
76 | #include "hw/9pfs/9p-proxy.h" | 75 | #include "hw/9pfs/9p-proxy.h" |
76 | #include "hw/9pfs/9p-util.h" | ||
77 | #include "fsdev/9p-iov-marshal.h" | 77 | #include "fsdev/9p-iov-marshal.h" |
78 | - | 78 | - |
79 | +/* | 79 | +/* |
@@ -84,3 +84,6 @@ index 6f132c5f..8329950c 100644 | |||
84 | #define PROGNAME "virtfs-proxy-helper" | 84 | #define PROGNAME "virtfs-proxy-helper" |
85 | 85 | ||
86 | #ifndef XFS_SUPER_MAGIC | 86 | #ifndef XFS_SUPER_MAGIC |
87 | -- | ||
88 | 2.25.1 | ||
89 | |||