<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10821">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">minor: add checks on configurations and functions<br><br>these checks prevent out of bounds access and running<br>unset function pointers.<br><br>Change-Id: Ida889d40b898fc1ab8b885800431833570fdaafe<br>---<br>M firmware/apps/cardem/main.c<br>1 file changed, 17 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/apps/cardem/main.c b/firmware/apps/cardem/main.c</span><br><span>index 600e4e9..0b5fbde 100644</span><br><span>--- a/firmware/apps/cardem/main.c</span><br><span>+++ b/firmware/apps/cardem/main.c</span><br><span>@@ -101,7 +101,11 @@</span><br><span> void USBDDriverCallbacks_ConfigurationChanged(uint8_t cfgnum)</span><br><span> {</span><br><span>    TRACE_INFO_WP("cfgChanged%d ", cfgnum);</span><br><span style="color: hsl(0, 100%, 40%);">-       simtrace_config = cfgnum;</span><br><span style="color: hsl(120, 100%, 40%);">+     if (cfgnum < ARRAY_SIZE(config_func_ptrs)) {</span><br><span style="color: hsl(120, 100%, 40%);">+               simtrace_config = cfgnum;</span><br><span style="color: hsl(120, 100%, 40%);">+     } else {</span><br><span style="color: hsl(120, 100%, 40%);">+              TRACE_ERROR("trying to set out of bounds config %u\r\n", cfgnum);</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span> }</span><br><span> </span><br><span> void USART1_IrqHandler(void)</span><br><span>@@ -204,7 +208,9 @@</span><br><span>     }</span><br><span> </span><br><span>        TRACE_INFO("calling init of config %u...\n\r", simtrace_config);</span><br><span style="color: hsl(0, 100%, 40%);">-      config_func_ptrs[simtrace_config].init();</span><br><span style="color: hsl(120, 100%, 40%);">+     if (config_func_ptrs[simtrace_config].init) {</span><br><span style="color: hsl(120, 100%, 40%);">+         config_func_ptrs[simtrace_config].init();</span><br><span style="color: hsl(120, 100%, 40%);">+     }</span><br><span>    last_simtrace_config = simtrace_config;</span><br><span> </span><br><span>  TRACE_INFO("entering main loop...\n\r");</span><br><span>@@ -232,11 +238,17 @@</span><br><span>           if (last_simtrace_config != simtrace_config) {</span><br><span>                       TRACE_INFO("USB config chg %u -> %u\n\r",</span><br><span>                                  last_simtrace_config, simtrace_config);</span><br><span style="color: hsl(0, 100%, 40%);">-                      config_func_ptrs[last_simtrace_config].exit();</span><br><span style="color: hsl(0, 100%, 40%);">-                  config_func_ptrs[simtrace_config].init();</span><br><span style="color: hsl(120, 100%, 40%);">+                     if (config_func_ptrs[last_simtrace_config].exit) {</span><br><span style="color: hsl(120, 100%, 40%);">+                            config_func_ptrs[last_simtrace_config].exit();</span><br><span style="color: hsl(120, 100%, 40%);">+                        }</span><br><span style="color: hsl(120, 100%, 40%);">+                     if (config_func_ptrs[simtrace_config].init) {</span><br><span style="color: hsl(120, 100%, 40%);">+                         config_func_ptrs[simtrace_config].init();</span><br><span style="color: hsl(120, 100%, 40%);">+                     }</span><br><span>                    last_simtrace_config = simtrace_config;</span><br><span>              } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                        config_func_ptrs[simtrace_config].run();</span><br><span style="color: hsl(120, 100%, 40%);">+                      if (config_func_ptrs[simtrace_config].run) {</span><br><span style="color: hsl(120, 100%, 40%);">+                          config_func_ptrs[simtrace_config].run();</span><br><span style="color: hsl(120, 100%, 40%);">+                      }</span><br><span>            }</span><br><span>    }</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10821">change 10821</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10821"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ida889d40b898fc1ab8b885800431833570fdaafe </div>
<div style="display:none"> Gerrit-Change-Number: 10821 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>