diff options
| author |   Sakib Sajal <sakib.sajal@windriver.com> | 2021-08-25 19:00:51 -0400 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2021-08-26 10:10:56 -0700 |
| commit | 59d6f63abbc5115de147f22fa0496d39533c020d (patch) | |
| tree | 996dd2032acf5d04837e624b35370beedc0951d0 /meta-oe | |
| parent | 1c9188c942fe222b6a360e6e843aee2d6d156940 (diff) | |
| download | meta-openembedded-59d6f63abbc5115de147f22fa0496d39533c020d.tar.gz | |
gd: fix CVE-2021-38115
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch | 29 | ||||
| -rw-r--r-- | meta-oe/recipes-support/gd/gd_2.3.2.bb | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch b/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch new file mode 100644 index 0000000000..6152a11843 --- /dev/null +++ b/meta-oe/recipes-support/gd/gd/0001-fix-read-out-of-bands-in-reading-tga-header-file.patch @@ -0,0 +1,29 @@ +From 8b111b2b4a4842179be66db68d84dda91a246032 Mon Sep 17 00:00:00 2001 +From: maryam ebrahimzadeh <maryam.ebr@student.sharif.edu> +Date: Mon, 19 Jul 2021 10:07:13 +0430 +Subject: [PATCH] fix read out-of-bands in reading tga header file + +--- + src/gd_tga.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/gd_tga.c b/src/gd_tga.c +index cae9428..286febb 100644 +--- a/src/gd_tga.c ++++ b/src/gd_tga.c +@@ -191,7 +191,11 @@ int read_header_tga(gdIOCtx *ctx, oTga *tga) + return -1; + } + +- gdGetBuf(tga->ident, tga->identsize, ctx); ++ ++ if (gdGetBuf(tga->ident, tga->identsize, ctx) != tga->identsize) { ++ gd_error("fail to read header ident"); ++ return -1; ++ } + } + + return 1; +-- +2.25.1 + diff --git a/meta-oe/recipes-support/gd/gd_2.3.2.bb b/meta-oe/recipes-support/gd/gd_2.3.2.bb index c9ed029f96..32484ce791 100644 --- a/meta-oe/recipes-support/gd/gd_2.3.2.bb +++ b/meta-oe/recipes-support/gd/gd_2.3.2.bb @@ -15,6 +15,7 @@ DEPENDS = "freetype libpng jpeg zlib tiff" SRC_URI = "git://github.com/libgd/libgd.git;branch=master \ file://0001-replace-uint32-with-uint32_t-and-uint16-with-uint16_.patch \ + file://0001-fix-read-out-of-bands-in-reading-tga-header-file.patch \ " SRCREV = "2e40f55bfb460fc9d8cbcd290a0c9eb908d5af7e" |