mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +02:00
9287a355b3
* fixes: DEBUG: Executing python function do_qa_patch ERROR: QA Issue: Malformed Upstream-Status in patch TOPDIR/meta-virtualization/recipes-containers/docker/files/CVE-2024-36620.patch Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : Upstream-Status: [patch-status] ERROR: QA Issue: Malformed Upstream-Status in patch TOPDIR/meta-virtualization/recipes-containers/docker/files/CVE-2024-36621.patch Please correct according to https://docs.yoctoproject.org/contributor-guide/recipe-style-guide.html#patch-upstream-status : Upstream-Status: [patch-status] ERROR: Fatal QA errors were found, failing task. Signed-off-by: Martin Jansa <martin.jansa@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From ab570ab3d62038b3d26f96a9bb585d0b6095b9b4 Mon Sep 17 00:00:00 2001
|
|
From: Christopher Petito <47751006+krissetto@users.noreply.github.com>
|
|
Date: Fri, 19 Apr 2024 10:44:30 +0000
|
|
Subject: [PATCH] nil dereference fix on image history Created value
|
|
|
|
Issue was caused by the changes here https://github.com/moby/moby/pull/45504
|
|
First released in v25.0.0-beta.1
|
|
|
|
CVE: CVE-2024-36620
|
|
|
|
Upstream-Status: Backport [https://github.com/moby/moby/commit/ab570ab3d62038b3d26f96a9bb585d0b6095b9b4]
|
|
|
|
Signed-off-by: Praveen Kumar <praveen.kumar@windriver.com>
|
|
---
|
|
daemon/images/image_history.go | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/daemon/images/image_history.go b/daemon/images/image_history.go
|
|
index dcf7a906aa..e5adda8639 100644
|
|
--- a/daemon/images/image_history.go
|
|
+++ b/daemon/images/image_history.go
|
|
@@ -41,10 +41,14 @@ func (i *ImageService) ImageHistory(ctx context.Context, name string) ([]*image.
|
|
layer.ReleaseAndLog(i.layerStore, l)
|
|
layerCounter++
|
|
}
|
|
+ var created int64
|
|
+ if h.Created != nil {
|
|
+ created = h.Created.Unix()
|
|
+ }
|
|
|
|
history = append([]*image.HistoryResponseItem{{
|
|
ID: "<missing>",
|
|
- Created: h.Created.Unix(),
|
|
+ Created: created,
|
|
CreatedBy: h.CreatedBy,
|
|
Comment: h.Comment,
|
|
Size: layerSize,
|
|
--
|
|
2.40.0
|