diff mbox series

[meta-oe,1/1] libksba: fix CVE-2022-3515

Message ID 20221220062956.609061-1-manojsingh.saun@windriver.com
State New
Headers show
Series [meta-oe,1/1] libksba: fix CVE-2022-3515 | expand

Commit Message

Manoj Saun Dec. 20, 2022, 6:29 a.m. UTC 
libksba: integer overflow may lead to remote code execution.

Reference:
https://www.gnupg.org/blog/20221017-pepe-left-the-ksba.html

Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=commit;h=4b7d9cd4a018898d7714ce06f3faf2626c14582b]

CVE: CVE-2022-3515

Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com>
---
 ...e-overflow-directly-in-the-TLV-parse.patch | 42 +++++++++++++++++++
 meta/recipes-support/libksba/libksba_1.6.2.bb |  3 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch

Comments

Polampalli, Archana Dec. 20, 2022, 6:34 a.m. UTC | #1 
Hi Manoj,

Please remove [meta-oe] in patch subject, it should be

[OE-core][PATCH 1/1] libksba: fix CVE-2022-3515

Regards,
Archana
Randy MacLeod Dec. 20, 2022, 2:29 p.m. UTC | #2 
On 2022-12-20 01:34, Polampalli, Archana via lists.openembedded.org wrote:
> Hi Manoj,
>
> Please remove [meta-oe] in patch subject, it should be
>
> [OE-core][PATCH 1/1] libksba: fix CVE-2022-3515


Hi Manoj,


Instead of patching, please update to release 1.6.3 and add ptest 
coverage since
the source has some c code in the tests directory.


../Randy



>
> Regards,
> Archana
> ------------------------------------------------------------------------
> *From:* openembedded-core@lists.openembedded.org 
> <openembedded-core@lists.openembedded.org> on behalf of Manoj Saun via 
> lists.openembedded.org 
> <manojsingh.saun=windriver.com@lists.openembedded.org>
> *Sent:* Tuesday, December 20, 2022 11:59 AM
> *To:* openembedded-core@lists.openembedded.org 
> <openembedded-core@lists.openembedded.org>
> *Cc:* Mali, Narpat <Narpat.Mali@windriver.com>; G Pillai, Hari 
> <Hari.GPillai@windriver.com>; Kang, Kai <Kai.Kang@windriver.com>; 
> Saun, Manoj Singh <ManojSingh.Saun@windriver.com>
> *Subject:* [OE-core] [meta-oe][PATCH 1/1] libksba: fix CVE-2022-3515
> libksba: integer overflow may lead to remote code execution.
>
> Reference:
> https://www.gnupg.org/blog/20221017-pepe-left-the-ksba.html
>
> Upstream-Status: Backport 
> [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=commit;h=4b7d9cd4a018898d7714ce06f3faf2626c14582b]
>
> CVE: CVE-2022-3515
>
> Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com>
> ---
>  ...e-overflow-directly-in-the-TLV-parse.patch | 42 +++++++++++++++++++
>  meta/recipes-support/libksba/libksba_1.6.2.bb |  3 +-
>  2 files changed, 44 insertions(+), 1 deletion(-)
>  create mode 100644 
> meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch
>
> diff --git 
> a/meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch 
> b/meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch
> new file mode 100644
> index 0000000000..e2cb842a4d
> --- /dev/null
> +++ 
> b/meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch
> @@ -0,0 +1,42 @@
> +From 4b7d9cd4a018898d7714ce06f3faf2626c14582b Mon Sep 17 00:00:00 2001
> +From: Werner Koch <wk@gnupg.org>
> +Date: Wed, 5 Oct 2022 14:19:06 +0200
> +Subject: [PATCH] Detect a possible overflow directly in the TLV parser.
> +
> +Upstream-Status: Backport 
> [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=commit;h=4b7d9cd4a018898d7714ce06f3faf2626c14582b]
> +
> +CVE: CVE-2022-3515
> +
> +Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com>
> +
> +* src/ber-help.c (_ksba_ber_read_tl): Check for overflow of a commonly
> +used sum.
> +--
> +
> +It is quite common to have checks like
> +
> +    if (ti.nhdr + ti.length >= DIM(tmpbuf))
> +       return gpg_error (GPG_ERR_TOO_LARGE);
> +
> +This patch detects possible integer overflows immmediately when
> +creating the TI object.
> +
> +Reported-by: ZDI-CAN-18927, ZDI-CAN-18928, ZDI-CAN-18929
> +---
> + src/ber-help.c | 6 ++++++
> + 1 file changed, 6 insertions(+)
> +
> +diff --git a/src/ber-help.c b/src/ber-help.c
> +index 81c31ed..56efb6a 100644
> +--- a/src/ber-help.c
> ++++ b/src/ber-help.c
> +@@ -182,6 +182,12 @@ _ksba_ber_read_tl (ksba_reader_t reader, struct 
> tag_info *ti)
> +       ti->length = len;
> +     }
> +
> ++  if (ti->length > ti->nhdr && (ti->nhdr + ti->length) < ti->length)
> ++    {
> ++      ti->err_string = "header+length would overflow";
> ++      return gpg_error (GPG_ERR_EOVERFLOW);
> ++    }
> ++
> +   /* Without this kludge some example certs can't be parsed */
> +   if (ti->class == CLASS_UNIVERSAL && !ti->tag)
> +     ti->length = 0;
> +--
> +2.34.1
> +
> diff --git a/meta/recipes-support/libksba/libksba_1.6.2.bb 
> b/meta/recipes-support/libksba/libksba_1.6.2.bb
> index f6ecb9aec4..c25c23ef0f 100644
> --- a/meta/recipes-support/libksba/libksba_1.6.2.bb
> +++ b/meta/recipes-support/libksba/libksba_1.6.2.bb
> @@ -22,7 +22,8 @@ inherit autotools binconfig-disabled pkgconfig texinfo
>
>  UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
>  SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
> - file://ksba-add-pkgconfig-support.patch" 
> <file://ksba-add-pkgconfig-support.patch">
> + file://ksba-add-pkgconfig-support.patch 
> <file://ksba-add-pkgconfig-support.patch> \
> + 
> file://0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch" 
> <file://0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch">
>
>  SRC_URI[sha256sum] = 
> "fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971"
>
> -- 
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#174843):https://lists.openembedded.org/g/openembedded-core/message/174843
> Mute This Topic:https://lists.openembedded.org/mt/95781520/3616765
> Group Owner:openembedded-core+owner@lists.openembedded.org
> Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub  [randy.macleod@windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Alexandre Belloni Dec. 20, 2022, 2:36 p.m. UTC | #3 
Hello,

This doesn't build:

| ../../libksba-1.6.2/src/ber-help.c:198:3: error: expected identifier or '(' before 'if'
|   198 |   if (ti->length > ti->nhdr && (ti->nhdr + ti->length) < ti->length)
|       |   ^~
| make[3]: *** [Makefile:739: ber_dump-ber-help.o] Error 1
| make[3]: *** Waiting for unfinished jobs....
| libtool: compile:  i686-poky-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot -DHAVE_CONFIG_H -I. -I../../libksba-1.6.2/src -I.. -I../gl -I../../libksba-1.6.2/gl -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot-native= -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign -fvisibility=hidden -c ../../libksba-1.6.2/src/asn1-func.c  -fPIC -DPIC -o .libs/asn1-func.o
| libtool: compile:  i686-poky-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot -DHAVE_CONFIG_H -I. -I../../libksba-1.6.2/src -I.. -I../gl -I../../libksba-1.6.2/gl -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot-native= -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign -fvisibility=hidden -c ../../libksba-1.6.2/src/writer.c  -fPIC -DPIC -o .libs/writer.o
| libtool: compile:  i686-poky-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot -DHAVE_CONFIG_H -I. -I../../libksba-1.6.2/src -I.. -I../gl -I../../libksba-1.6.2/gl -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot-native= -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign -fvisibility=hidden -c ../../libksba-1.6.2/src/asn1-func2.c  -fPIC -DPIC -o .libs/asn1-func2.o
| libtool: compile:  i686-poky-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot -DHAVE_CONFIG_H -I. -I../../libksba-1.6.2/src -I.. -I../gl -I../../libksba-1.6.2/gl -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot-native= -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign -fvisibility=hidden -c ../../libksba-1.6.2/src/visibility.c  -fPIC -DPIC -o .libs/visibility.o
| libtool: compile:  i686-poky-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot -DHAVE_CONFIG_H -I. -I../../libksba-1.6.2/src -I.. -I../gl -I../../libksba-1.6.2/gl -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot-native= -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign -fvisibility=hidden -c ../../libksba-1.6.2/src/reader.c  -fPIC -DPIC -o .libs/reader.o
| libtool: compile:  i686-poky-linux-gcc -m32 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot -DHAVE_CONFIG_H -I. -I../../libksba-1.6.2/src -I.. -I../gl -I../../libksba-1.6.2/gl -O2 -pipe -g -feliminate-unused-debug-types -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/libksba-1.6.2=/usr/src/debug/libksba/1.6.2-r0 -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build=/usr/src/debug/libksba/1.6.2-r0 -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fmacro-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot= -fdebug-prefix-map=/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/recipe-sysroot-native= -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wpointer-arith -Wno-pointer-sign -fvisibility=hidden -c ../../libksba-1.6.2/src/asn1-parse.c  -fPIC -DPIC -o .libs/asn1-parse.o
| make[3]: Leaving directory '/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build/src'
| make[2]: *** [Makefile:510: all] Error 2
| make[2]: Leaving directory '/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build/src'
| make[1]: Leaving directory '/home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/build'
| make[1]: *** [Makefile:482: all-recursive] Error 1
| make: *** [Makefile:414: all] Error 2
| ERROR: oe_runmake failed
| WARNING: /home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/temp/run.do_compile.1534480:182 exit 1 from 'exit 1'
| WARNING: Backtrace (BB generated script):
| 	#1: bbfatal_log, /home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/temp/run.do_compile.1534480, line 182
| 	#2: die, /home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/temp/run.do_compile.1534480, line 166
| 	#3: oe_runmake, /home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/temp/run.do_compile.1534480, line 161
| 	#4: autotools_do_compile, /home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/temp/run.do_compile.1534480, line 156
| 	#5: do_compile, /home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/temp/run.do_compile.1534480, line 151
| 	#6: main, /home/pokybuild/yocto-worker/genericx86-alt/build/build/tmp/work/core2-32-poky-linux/libksba/1.6.2-r0/temp/run.do_compile.1534480, line 195
NOTE: recipe libksba-1.6.2-r0: task do_compile: Failed
ERROR: Task (/home/pokybuild/yocto-worker/genericx86-alt/build/meta/recipes-support/libksba/libksba_1.6.2.bb:do_compile) failed with exit code '1'

On 20/12/2022 06:29:56+0000, Manoj Saun wrote:
> libksba: integer overflow may lead to remote code execution.
> 
> Reference:
> https://www.gnupg.org/blog/20221017-pepe-left-the-ksba.html
> 
> Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=commit;h=4b7d9cd4a018898d7714ce06f3faf2626c14582b]
> 
> CVE: CVE-2022-3515
> 
> Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com>
> ---
>  ...e-overflow-directly-in-the-TLV-parse.patch | 42 +++++++++++++++++++
>  meta/recipes-support/libksba/libksba_1.6.2.bb |  3 +-
>  2 files changed, 44 insertions(+), 1 deletion(-)
>  create mode 100644 meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch
> 
> diff --git a/meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch b/meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch
> new file mode 100644
> index 0000000000..e2cb842a4d
> --- /dev/null
> +++ b/meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch
> @@ -0,0 +1,42 @@
> +From 4b7d9cd4a018898d7714ce06f3faf2626c14582b Mon Sep 17 00:00:00 2001
> +From: Werner Koch <wk@gnupg.org>
> +Date: Wed, 5 Oct 2022 14:19:06 +0200
> +Subject: [PATCH] Detect a possible overflow directly in the TLV parser.
> +
> +Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=commit;h=4b7d9cd4a018898d7714ce06f3faf2626c14582b]
> +
> +CVE: CVE-2022-3515
> +
> +Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com>
> +
> +* src/ber-help.c (_ksba_ber_read_tl): Check for overflow of a commonly
> +used sum.
> +--
> +
> +It is quite common to have checks like
> +
> +    if (ti.nhdr + ti.length >= DIM(tmpbuf))
> +       return gpg_error (GPG_ERR_TOO_LARGE);
> +
> +This patch detects possible integer overflows immmediately when
> +creating the TI object.
> +
> +Reported-by: ZDI-CAN-18927, ZDI-CAN-18928, ZDI-CAN-18929
> +---
> + src/ber-help.c | 6 ++++++
> + 1 file changed, 6 insertions(+)
> +
> +diff --git a/src/ber-help.c b/src/ber-help.c
> +index 81c31ed..56efb6a 100644
> +--- a/src/ber-help.c
> ++++ b/src/ber-help.c
> +@@ -182,6 +182,12 @@ _ksba_ber_read_tl (ksba_reader_t reader, struct tag_info *ti)
> +       ti->length = len;
> +     }
> + 
> ++  if (ti->length > ti->nhdr && (ti->nhdr + ti->length) < ti->length)
> ++    {
> ++      ti->err_string = "header+length would overflow";
> ++      return gpg_error (GPG_ERR_EOVERFLOW);
> ++    }
> ++
> +   /* Without this kludge some example certs can't be parsed */
> +   if (ti->class == CLASS_UNIVERSAL && !ti->tag)
> +     ti->length = 0;
> +-- 
> +2.34.1
> +
> diff --git a/meta/recipes-support/libksba/libksba_1.6.2.bb b/meta/recipes-support/libksba/libksba_1.6.2.bb
> index f6ecb9aec4..c25c23ef0f 100644
> --- a/meta/recipes-support/libksba/libksba_1.6.2.bb
> +++ b/meta/recipes-support/libksba/libksba_1.6.2.bb
> @@ -22,7 +22,8 @@ inherit autotools binconfig-disabled pkgconfig texinfo
>  
>  UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
>  SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
> -           file://ksba-add-pkgconfig-support.patch"
> +           file://ksba-add-pkgconfig-support.patch \
> +           file://0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch"
>  
>  SRC_URI[sha256sum] = "fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971"
>  
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#174842): https://lists.openembedded.org/g/openembedded-core/message/174842
> Mute This Topic: https://lists.openembedded.org/mt/95781520/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch b/meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch
new file mode 100644
index 0000000000..e2cb842a4d
--- /dev/null
+++ b/meta/recipes-support/libksba/libksba/0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch
@@ -0,0 +1,42 @@ 
+From 4b7d9cd4a018898d7714ce06f3faf2626c14582b Mon Sep 17 00:00:00 2001
+From: Werner Koch <wk@gnupg.org>
+Date: Wed, 5 Oct 2022 14:19:06 +0200
+Subject: [PATCH] Detect a possible overflow directly in the TLV parser.
+
+Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libksba.git;a=commit;h=4b7d9cd4a018898d7714ce06f3faf2626c14582b]
+
+CVE: CVE-2022-3515
+
+Signed-off-by: Manoj Saun <manojsingh.saun@windriver.com>
+
+* src/ber-help.c (_ksba_ber_read_tl): Check for overflow of a commonly
+used sum.
+--
+
+It is quite common to have checks like
+
+    if (ti.nhdr + ti.length >= DIM(tmpbuf))
+       return gpg_error (GPG_ERR_TOO_LARGE);
+
+This patch detects possible integer overflows immmediately when
+creating the TI object.
+
+Reported-by: ZDI-CAN-18927, ZDI-CAN-18928, ZDI-CAN-18929
+---
+ src/ber-help.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/ber-help.c b/src/ber-help.c
+index 81c31ed..56efb6a 100644
+--- a/src/ber-help.c
++++ b/src/ber-help.c
+@@ -182,6 +182,12 @@ _ksba_ber_read_tl (ksba_reader_t reader, struct tag_info *ti)
+       ti->length = len;
+     }
+ 
++  if (ti->length > ti->nhdr && (ti->nhdr + ti->length) < ti->length)
++    {
++      ti->err_string = "header+length would overflow";
++      return gpg_error (GPG_ERR_EOVERFLOW);
++    }
++
+   /* Without this kludge some example certs can't be parsed */
+   if (ti->class == CLASS_UNIVERSAL && !ti->tag)
+     ti->length = 0;
+-- 
+2.34.1
+
diff --git a/meta/recipes-support/libksba/libksba_1.6.2.bb b/meta/recipes-support/libksba/libksba_1.6.2.bb
index f6ecb9aec4..c25c23ef0f 100644
--- a/meta/recipes-support/libksba/libksba_1.6.2.bb
+++ b/meta/recipes-support/libksba/libksba_1.6.2.bb
@@ -22,7 +22,8 @@  inherit autotools binconfig-disabled pkgconfig texinfo
 
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
 SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
-           file://ksba-add-pkgconfig-support.patch"
+           file://ksba-add-pkgconfig-support.patch \
+           file://0001-Detect-a-possible-overflow-directly-in-the-TLV-parse.patch"
 
 SRC_URI[sha256sum] = "fce01ccac59812bddadffacff017dac2e4762bdb6ebc6ffe06f6ed4f6192c971"