From a525b6afb7a3d4360f5bb283595a927bd21be3c8 Mon Sep 17 00:00:00 2001 From: Gzx1999 Date: Tue, 5 Sep 2023 20:33:12 +0800 Subject: [PATCH] fix CVE-2023-2977 --- ...eft_length_calculation_to_fix_buffer.patch | 49 +++++++++++++++++++ opensc.spec | 7 ++- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 0001-correct_left_length_calculation_to_fix_buffer.patch diff --git a/0001-correct_left_length_calculation_to_fix_buffer.patch b/0001-correct_left_length_calculation_to_fix_buffer.patch new file mode 100644 index 0000000..3226107 --- /dev/null +++ b/0001-correct_left_length_calculation_to_fix_buffer.patch @@ -0,0 +1,49 @@ +From 3bf3ab2f9091f984cda6dd910654ccbbe3f06a40 Mon Sep 17 00:00:00 2001 +From: fullwaywang +Date: Mon, 29 May 2023 10:38:48 +0800 +Subject: [PATCH] pkcs15init: correct left length calculation to fix buffer + overrun bug. Fixes #2785 + +--- + src/pkcs15init/pkcs15-cardos.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c +index 9715cf390f..f41f73c349 100644 +--- a/src/pkcs15init/pkcs15-cardos.c ++++ b/src/pkcs15init/pkcs15-cardos.c +@@ -872,7 +872,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + sc_apdu_t apdu; + u8 rbuf[SC_MAX_APDU_BUFFER_SIZE]; + int r; +- const u8 *p = rbuf, *q; ++ const u8 *p = rbuf, *q, *pp; + size_t len, tlen = 0, ilen = 0; + + sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xca, 0x01, 0x88); +@@ -888,13 +888,13 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + return 0; + + while (len != 0) { +- p = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); +- if (p == NULL) ++ pp = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen); ++ if (pp == NULL) + return 0; + if (card->type == SC_CARD_TYPE_CARDOS_M4_3) { + /* the verifyRC package on CardOS 4.3B use Manufacturer ID 0x01 */ + /* and Package Number 0x07 */ +- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x01, &ilen); ++ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x01, &ilen); + if (q == NULL || ilen != 4) + return 0; + if (q[0] == 0x07) +@@ -902,7 +902,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card) + } else if (card->type == SC_CARD_TYPE_CARDOS_M4_4) { + /* the verifyRC package on CardOS 4.4 use Manufacturer ID 0x03 */ + /* and Package Number 0x02 */ +- q = sc_asn1_find_tag(card->ctx, p, tlen, 0x03, &ilen); ++ q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x03, &ilen); + if (q == NULL || ilen != 4) + return 0; + if (q[0] == 0x02) diff --git a/opensc.spec b/opensc.spec index b30bda0..6ed9463 100644 --- a/opensc.spec +++ b/opensc.spec @@ -3,12 +3,12 @@ Name: opensc Version: 0.23.0 -Release: 1 +Release: 2 License: LGPL-2.1-or-later Summary: Smart card library and applications URL: https://github.com/OpenSC/OpenSC/wiki Source0: https://github.com/OpenSC/OpenSC/releases/download/%{version}/%{name}-%{version}.tar.gz - +Patch0: 0001-correct_left_length_calculation_to_fix_buffer.patch BuildRequires: openssl-devel pcsc-lite-devel bash-completion docbook-style-xsl readline-devel BuildRequires: desktop-file-utils /usr/bin/xsltproc autoconf automake libtool gcc @@ -139,6 +139,9 @@ make check %{_datadir}/opensc/ %changelog +* Tue Sep 5 2023 Zhengxin Guo - 0.23.0-2 +- fix CVE-2023-2977 + * Wed Feb 1 2023 wangjunqi - 0.23.0-1 - update version to 0.23.0 -- Gitee