Fix up incorrect checks in CVE-2010-0407.patch (#596426)

This commit is contained in:
Kalev Lember 2010-07-04 14:30:40 +00:00
parent e7a10ec46f
commit a28c7042ad
2 changed files with 6 additions and 3 deletions

View File

@ -36,7 +36,7 @@ diff -ru pcsc-lite-1.4.102.orig//src/winscard_svc.c pcsc-lite-1.4.102/src/winsca
if (rv != 0) return rv; if (rv != 0) return rv;
+ /* avoids buffer overflow */ + /* avoids buffer overflow */
+ if ((ctStr->cbRecvLength > sizeof(ctStr->cbRecvLength)) + if ((ctStr->cbRecvLength > sizeof(ctStr->pbRecvBuffer))
+ || (ctStr->cbSendLength > sizeof(ctStr->pbSendBuffer))) + || (ctStr->cbSendLength > sizeof(ctStr->pbSendBuffer)))
+ { + {
+ ctStr->rv = SCARD_E_INSUFFICIENT_BUFFER; + ctStr->rv = SCARD_E_INSUFFICIENT_BUFFER;
@ -66,7 +66,7 @@ diff -ru pcsc-lite-1.4.102.orig//src/winscard_svc.c pcsc-lite-1.4.102/src/winsca
if (rv != 0) return rv; if (rv != 0) return rv;
+ +
+ /* avoids buffer overflow */ + /* avoids buffer overflow */
+ if (gsStr->cbAttrLen <= sizeof(gsStr->pbAttr)) + if (gsStr->cbAttrLen > sizeof(gsStr->pbAttr))
+ { + {
+ gsStr->rv = SCARD_E_INSUFFICIENT_BUFFER ; + gsStr->rv = SCARD_E_INSUFFICIENT_BUFFER ;
+ break; + break;

View File

@ -1,6 +1,6 @@
Name: pcsc-lite Name: pcsc-lite
Version: 1.5.2 Version: 1.5.2
Release: 4%{?dist} Release: 5%{?dist}
Summary: PC/SC Lite smart card framework and applications Summary: PC/SC Lite smart card framework and applications
%define upstream_build 2795 %define upstream_build 2795
@ -154,6 +154,9 @@ fi
%changelog %changelog
* Sun Jul 04 2010 Kalev Lember <kalev@smartlink.ee> - 1.5.2-5
- Fix up incorrect checks in CVE-2010-0407.patch (#596426)
* Tue Jun 15 2010 Kalev Lember <kalev@smartlink.ee> - 1.5.2-4 * Tue Jun 15 2010 Kalev Lember <kalev@smartlink.ee> - 1.5.2-4
- Patch for CVE-2010-0407 - Patch for CVE-2010-0407