Change in ...osmo-ccid-firmware[master]: ccid: Fix overflow in Fi value

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Fri Oct 4 15:58:07 UTC 2019


laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15646 )

Change subject: ccid: Fix overflow in Fi value
......................................................................

ccid: Fix overflow in Fi value

The Fi value can easily exceed 8bits. Even its default of 372 already
exceeds 256...

Change-Id: If2e2c46411d724883dca48f24e08d002e6670299
---
M ccid/ccid_device.h
M ccid/ccid_slot_sim.c
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/ccid/ccid_device.h b/ccid/ccid_device.h
index d9cba52..afd4a7a 100644
--- a/ccid/ccid_device.h
+++ b/ccid/ccid_device.h
@@ -19,8 +19,8 @@
 
 struct ccid_pars_decoded {
 	/* global for T0/T1 */
-	uint8_t fi;
-	uint8_t di;
+	uint32_t fi;
+	uint32_t di;
 	enum ccid_clock_stop clock_stop;
 	bool inverse_convention;
 
diff --git a/ccid/ccid_slot_sim.c b/ccid/ccid_slot_sim.c
index 7bd1dba..1bd514a 100644
--- a/ccid/ccid_slot_sim.c
+++ b/ccid/ccid_slot_sim.c
@@ -32,8 +32,8 @@
 		0x07, 0x18, 0x00, 0x00, 0x01, 0xA5 };
 
 static const struct ccid_pars_decoded slotsim_def_pars = {
-	.fi = 0,
-	.di = 0,
+	.fi = 372,
+	.di = 1,
 	.clock_stop = CCID_CLOCK_STOP_NOTALLOWED,
 	.inverse_convention = false,
 	.t0 = {

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15646
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: If2e2c46411d724883dca48f24e08d002e6670299
Gerrit-Change-Number: 15646
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191004/db85386b/attachment.htm>


More information about the gerrit-log mailing list