Почетна Преглед Помоћ
Регистрација Пријавите се
PUBLIC_REPOS
/
buildroot
огледало од git://git.buildroot.net/buildroot
2
1
Креирај огранак 0
Датотеке
Дрво: 2d9540e248
Гране Ознаке
buildroot
/
package
/
opensc
/
0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch

0004-pkcs15init-correct-left-length-calculation-to-fix-buffer-overrun-bug.patch 2.0 KB
Историја Датотека

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 
  1. From 81944d1529202bd28359bede57c0a15deb65ba8a Mon Sep 17 00:00:00 2001
    2. 

  2. From: fullwaywang <fullwaywang@tencent.com>
    3. 

  3. Date: Mon, 29 May 2023 10:38:48 +0800
    4. 

  4. Subject: [PATCH] pkcs15init: correct left length calculation to fix buffer
    5. 

  5.  overrun bug. Fixes #2785
    6. 

  6. 

  7. Upstream: https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a
    8. 

  8. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
    9. 

  9. ---
    10. 

  10.  src/pkcs15init/pkcs15-cardos.c | 10 +++++-----
    11. 

  11.  1 file changed, 5 insertions(+), 5 deletions(-)
    12. 

  12. 

  13. diff --git a/src/pkcs15init/pkcs15-cardos.c b/src/pkcs15init/pkcs15-cardos.c
    14. 

  14. index 9715cf390f..f41f73c349 100644
    15. 

  15. --- a/src/pkcs15init/pkcs15-cardos.c
    16. 

  16. +++ b/src/pkcs15init/pkcs15-cardos.c
    17. 

  17. @@ -872,7 +872,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card)
    18. 

  18.  	sc_apdu_t apdu;
    19. 

  19.          u8        rbuf[SC_MAX_APDU_BUFFER_SIZE];
    20. 

  20.          int       r;
    21. 

  21. -	const u8  *p = rbuf, *q;
    22. 

  22. +	const u8  *p = rbuf, *q, *pp;
    23. 

  23.  	size_t    len, tlen = 0, ilen = 0;
    24. 

  24.  
    25. 

  25.  	sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, 0xca, 0x01, 0x88);
    26. 

  26. @@ -888,13 +888,13 @@ static int cardos_have_verifyrc_package(sc_card_t *card)
    27. 

  27.  		return 0;
    28. 

  28.  
    29. 

  29.  	while (len != 0) {
    30. 

  30. -		p = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen);
    31. 

  31. -		if (p == NULL)
    32. 

  32. +		pp = sc_asn1_find_tag(card->ctx, p, len, 0xe1, &tlen);
    33. 

  33. +		if (pp == NULL)
    34. 

  34.  			return 0;
    35. 

  35.  		if (card->type == SC_CARD_TYPE_CARDOS_M4_3)	{
    36. 

  36.  			/* the verifyRC package on CardOS 4.3B use Manufacturer ID 0x01	*/
    37. 

  37.  			/* and Package Number 0x07					*/
    38. 

  38. -			q = sc_asn1_find_tag(card->ctx, p, tlen, 0x01, &ilen);
    39. 

  39. +			q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x01, &ilen);
    40. 

  40.  			if (q == NULL || ilen != 4)
    41. 

  41.  				return 0;
    42. 

  42.  			if (q[0] == 0x07)
    43. 

  43. @@ -902,7 +902,7 @@ static int cardos_have_verifyrc_package(sc_card_t *card)
    44. 

  44.  		} else if (card->type == SC_CARD_TYPE_CARDOS_M4_4)	{
    45. 

  45.  			/* the verifyRC package on CardOS 4.4 use Manufacturer ID 0x03	*/
    46. 

  46.  			/* and Package Number 0x02					*/
    47. 

  47. -			q = sc_asn1_find_tag(card->ctx, p, tlen, 0x03, &ilen);
    48. 

  48. +			q = sc_asn1_find_tag(card->ctx, pp, tlen, 0x03, &ilen);
    49. 

  49.  			if (q == NULL || ilen != 4)
    50. 

  50.  				return 0;
    51. 

  51.  			if (q[0] == 0x02)
    52.