mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 18:32:13 +02:00
da5ad8a423
Clean up several patches introduced in commit 6732918498 ("grub:fix
several CVEs in grub 2.04").
1) Add CVE tags to individual patches.
2) Rename upstream patches and prefix them with CVE tags.
3) Add description of reference to upstream patch.
(From OE-Core rev: 4f395ad49ef9035954d0fda7b7df14dea18b49a0)
Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit bcb8b6719beaf6625e6b703e91958fe8afba5819)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From e219bad8cee67b2bb21712df8f055706f8da25d2 Mon Sep 17 00:00:00 2001
|
|
From: Chris Coulson <chris.coulson@canonical.com>
|
|
Date: Fri, 10 Jul 2020 11:21:14 +0100
|
|
Subject: [PATCH 7/9] script: Remove unused fields from grub_script_function
|
|
struct
|
|
|
|
Upstream-Status: Backport [commit 1a8d9c9b4ab6df7669b5aa36a56477f297825b96
|
|
from https://git.savannah.gnu.org/git/grub.git]
|
|
|
|
Signed-off-by: Chris Coulson <chris.coulson@canonical.com>
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
|
Signed-off-by: Yongxin Liu <yongxin.liu@windriver.com>
|
|
---
|
|
include/grub/script_sh.h | 5 -----
|
|
1 file changed, 5 deletions(-)
|
|
|
|
diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
|
|
index 360c2be..b382bcf 100644
|
|
--- a/include/grub/script_sh.h
|
|
+++ b/include/grub/script_sh.h
|
|
@@ -359,13 +359,8 @@ struct grub_script_function
|
|
/* The script function. */
|
|
struct grub_script *func;
|
|
|
|
- /* The flags. */
|
|
- unsigned flags;
|
|
-
|
|
/* The next element. */
|
|
struct grub_script_function *next;
|
|
-
|
|
- int references;
|
|
};
|
|
typedef struct grub_script_function *grub_script_function_t;
|
|
|
|
--
|
|
2.14.4
|
|
|