commit be7eeaf0e519b1857c2e869bc03d1f276eee2b23
author Aleksander Morgado <aleksander@aleksander.es> Wed Feb 16 20:47:26 2022
committer Commit Bot <commit-bot@chromium.org> Tue Feb 22 16:54:46 2022
tree d6303befc6faa64bb7a1d150e457b65656c8afc0
parent 20ee4552d9ae3d5b5760c68b65e103fb6f5d4036

UPSTREAM: sim-mbim: report error if decoding EID from APDU response fails

Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/510

BUG=b:219754938
TEST=Check that cellular connectivity is established with and without
eSIM. tast run ${cr} '("group:cellular" && "cellular_sim_active")'

Change-Id: Icf1729d3d0675d74d3dd5c75c338b0c63007c3e5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/modemmanager-next/+/3472883
Reviewed-by: Andrew Lassalle <andrewlassalle@chromium.org>
Tested-by: Pavan Holla <pholla@google.com>
Commit-Queue: Pavan Holla <pholla@google.com>
(cherry picked from commit ac624bb71d41abb8d1a57881152a4c54da831927)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/modemmanager-next/+/3473187

src/mm-sim-mbim.c

diff --git a/src/mm-sim-mbim.c b/src/mm-sim-mbim.c
index bf662b5..2bca42a 100644
--- a/src/mm-sim-mbim.c
+++ b/src/mm-sim-mbim.c
@@ -298,9 +298,13 @@
             &apdu_response,
             &error))
         ctx->saved_error = error;
-    else
+    else {
         ctx->eid = mm_decode_eid ((const gchar *)(apdu_response + EID_APDU_HEADER),
                                   apdu_response_size - EID_APDU_HEADER);
+        if (!ctx->eid)
+            ctx->saved_error = g_error_new (MM_CORE_ERROR, MM_CORE_ERROR_INVALID_ARGS,
+                                            "Invalid APDU response: unable to decode EID");
+    }
 
     /* always go on to the close channel step, even on error */
     ctx->step++;