Change in osmo-ccid-firmware[master]: iso7816_fsm: Fix APDU case with P3=0

[laforge]

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19951 )


Change subject: iso7816_fsm: Fix APDU case with P3=0
......................................................................

iso7816_fsm: Fix APDU case with P3=0

If P3=0 and we only receive a status word directly, we were
returning a very long mostly zero-initialized buffer instead
of the status word.  Reason: We used msgb_put() instaed of
msgb_put_u8(), so the SW1 determined the size of the message.

Change-Id: I01e688db020b3b8a8735d615e653cc816caa7a13
Closes: OS#4744
---
M ccid_common/iso7816_fsm.c
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/51/19951/1

diff --git a/ccid_common/iso7816_fsm.c b/ccid_common/iso7816_fsm.c
index 02e7c0d..a9d6ca1 100644
--- a/ccid_common/iso7816_fsm.c
+++ b/ccid_common/iso7816_fsm.c
@@ -1253,7 +1253,7 @@
 			osmo_fsm_inst_state_chg(fi, TPDU_S_PROCEDURE, 0, 0);
 		} else if ((byte >= 0x60 && byte <= 0x6f) || (byte >= 0x90 && byte <= 0x9f)) {
 			//msgb_apdu_sw(tfp->apdu) = byte << 8;
-			msgb_put(tfp->tpdu, byte);
+			msgb_put_u8(tfp->tpdu, byte);
 			/* receive second SW byte (SW2) */
 			card_uart_set_rx_threshold(ip->uart, 1);
 			card_uart_ctrl(ip->uart, CUART_CTL_RX_TIMER_HINT, 1);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/19951
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: I01e688db020b3b8a8735d615e653cc816caa7a13
Gerrit-Change-Number: 19951
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200902/09ed7fca/attachment.htm>