diff options
author | Marta Rybczynska <rybczynska@gmail.com> | 2022-02-18 11:05:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-02 00:21:36 +0000 |
commit | 37f35c47827c1b485f62340dbcf2f996a376075e (patch) | |
tree | 98c550509f62303e5a5c5eb249aa0e3ab14eef03 | |
parent | 877ea55a5bf084de0543b9b4a5b3bb8d2105ee95 (diff) | |
download | poky-37f35c47827c1b485f62340dbcf2f996a376075e.tar.gz |
grub: add a fix for unnecessary assignements
Add a fix for unnecessary assignements grub's io/lzopio. This patch
is a part of a security series [1].
[1] https://lists.gnu.org/archive/html/grub-devel/2021-03/msg00007.html
(From OE-Core rev: bb0841ebfe1035af7eb807afd9bd59979b8a5dd1)
Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-bsp/grub/files/0013-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch | 41 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0013-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch b/meta/recipes-bsp/grub/files/0013-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch new file mode 100644 index 0000000000..1190b0d090 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0013-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From c529ca446424f1a9c64f0007dfe31fa7645d13ac Mon Sep 17 00:00:00 2001 | ||
2 | From: Darren Kenny <darren.kenny@oracle.com> | ||
3 | Date: Wed, 21 Oct 2020 14:44:10 +0000 | ||
4 | Subject: [PATCH] io/lzopio: Resolve unnecessary self-assignment errors | ||
5 | |||
6 | These 2 assignments are unnecessary since they are just assigning | ||
7 | to themselves. | ||
8 | |||
9 | Fixes: CID 73643 | ||
10 | |||
11 | Signed-off-by: Darren Kenny <darren.kenny@oracle.com> | ||
12 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> | ||
13 | |||
14 | Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/grub.git/commit/?id=59666e520f44177c97b82a44c169b3b315d63b42] | ||
15 | Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com> | ||
16 | --- | ||
17 | grub-core/io/lzopio.c | 4 ---- | ||
18 | 1 file changed, 4 deletions(-) | ||
19 | |||
20 | diff --git a/grub-core/io/lzopio.c b/grub-core/io/lzopio.c | ||
21 | index 3014485..a7d4425 100644 | ||
22 | --- a/grub-core/io/lzopio.c | ||
23 | +++ b/grub-core/io/lzopio.c | ||
24 | @@ -125,8 +125,6 @@ read_block_header (struct grub_lzopio *lzopio) | ||
25 | sizeof (lzopio->block.ucheck)) != | ||
26 | sizeof (lzopio->block.ucheck)) | ||
27 | return -1; | ||
28 | - | ||
29 | - lzopio->block.ucheck = lzopio->block.ucheck; | ||
30 | } | ||
31 | |||
32 | /* Read checksum of compressed data. */ | ||
33 | @@ -143,8 +141,6 @@ read_block_header (struct grub_lzopio *lzopio) | ||
34 | sizeof (lzopio->block.ccheck)) != | ||
35 | sizeof (lzopio->block.ccheck)) | ||
36 | return -1; | ||
37 | - | ||
38 | - lzopio->block.ccheck = lzopio->block.ccheck; | ||
39 | } | ||
40 | } | ||
41 | |||
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index 4ddb9fc4f1..1906a28f30 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc | |||
@@ -59,6 +59,7 @@ SRC_URI = "${GNU_MIRROR}/grub/grub-${PV}.tar.gz \ | |||
59 | file://0010-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch \ | 59 | file://0010-gnulib-argp-help-Fix-dereference-of-a-possibly-NULL-.patch \ |
60 | file://0011-gnulib-regexec-Fix-possible-null-dereference.patch \ | 60 | file://0011-gnulib-regexec-Fix-possible-null-dereference.patch \ |
61 | file://0012-gnulib-regcomp-Fix-uninitialized-re_token.patch \ | 61 | file://0012-gnulib-regcomp-Fix-uninitialized-re_token.patch \ |
62 | file://0013-io-lzopio-Resolve-unnecessary-self-assignment-errors.patch \ | ||
62 | " | 63 | " |
63 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" | 64 | SRC_URI[md5sum] = "5ce674ca6b2612d8939b9e6abed32934" |
64 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" | 65 | SRC_URI[sha256sum] = "f10c85ae3e204dbaec39ae22fa3c5e99f0665417e91c2cb49b7e5031658ba6ea" |