laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42778?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: ccid: reject invalid bClockCommand
......................................................................
ccid: reject invalid bClockCommand
Change-Id: I34dedcaaaf3cd67e22b207016f08e745736dd625
---
M ccid_common/ccid_device.c
1 file changed, 9 insertions(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
jolly: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/ccid_common/ccid_device.c b/ccid_common/ccid_device.c
index 63a4d70..d9faa00 100644
--- a/ccid_common/ccid_device.c
+++ b/ccid_common/ccid_device.c
@@ -601,9 +601,17 @@
const union ccid_pc_to_rdr *u = msgb_ccid_out(msg);
const struct ccid_header *ch = (const struct ccid_header *) u;
uint8_t seq = u->icc_clock.hdr.bSeq;
+ uint8_t cmd = u->icc_clock.bClockCommand;
struct msgb *resp;
- cs->ci->slot_ops->set_clock(cs, u->icc_clock.bClockCommand);
+ /* CCID v1.1 ยง6.1.9: bClockCommand has only two defined values; reject
+ * early here */
+ if (cmd != CCID_CLOCK_CMD_RESTART && cmd != CCID_CLOCK_CMD_STOP) {
+ resp = ccid_gen_slot_status(cs, seq, CCID_CMD_STATUS_FAILED,
offsetof(struct ccid_pc_to_rdr_icc_clock, bClockCommand));
+ return ccid_slot_send_unbusy(cs, resp);
+ }
+
+ cs->ci->slot_ops->set_clock(cs, cmd);
resp = ccid_gen_slot_status(cs, seq, CCID_CMD_STATUS_OK, 0);
return ccid_slot_send_unbusy(cs, resp);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/42778?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: I34dedcaaaf3cd67e22b207016f08e745736dd625
Gerrit-Change-Number: 42778
Gerrit-PatchSet: 2
Gerrit-Owner: Hoernchen <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: jolly <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: lynxis lazus <[email protected]>
