<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28659">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/lib/edid: avoid buffer overflow<br><br>It's more theoretical, but lest somebody calls extract_string()<br>with too large a length...<br><br>Change-Id: I3934bd6965318cdffe5c636b01b3e0c4426e8d1d<br>Signed-off-by: Patrick Georgi <pgeorgi@google.com><br>Found-by: Coverity Scan #1374795<br>---<br>M src/lib/edid.c<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/28659/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/lib/edid.c b/src/lib/edid.c</span><br><span>index 9cf9b8a..0bfd20f 100644</span><br><span>--- a/src/lib/edid.c</span><br><span>+++ b/src/lib/edid.c</span><br><span>@@ -175,12 +175,12 @@</span><br><span> static char *</span><br><span> extract_string(unsigned char *x, int *valid_termination, int len)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-       static char ret[128];</span><br><span style="color: hsl(120, 100%, 40%);">+ static char ret[EDID_ASCII_STRING_LENGTH + 1];</span><br><span>       int i, seen_newline = 0;</span><br><span> </span><br><span>         memset(ret, 0, sizeof(ret));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        for (i = 0; i < len; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+        for (i = 0; i < min(len, EDID_ASCII_STRING_LENGTH); i++) {</span><br><span>                if (seen_newline) {</span><br><span>                  if (x[i] != 0x20) {</span><br><span>                          *valid_termination = 0;</span><br><span>@@ -284,7 +284,7 @@</span><br><span>                        printk(BIOS_SPEW, "Monitor name: %s\n",</span><br><span>                           extract_string(x + 5,</span><br><span>                                               &c->has_valid_string_termination,</span><br><span style="color: hsl(0, 100%, 40%);">-                                        13));</span><br><span style="color: hsl(120, 100%, 40%);">+                                         EDID_ASCII_STRING_LENGTH));</span><br><span>                    return 1;</span><br><span>            case 0xFD:</span><br><span>           {</span><br><span>@@ -476,7 +476,7 @@</span><br><span>              case 0xFF:</span><br><span>                   printk(BIOS_SPEW, "Serial number: %s\n",</span><br><span>                          extract_string(x + 5,</span><br><span style="color: hsl(0, 100%, 40%);">-                           &c->has_valid_string_termination, 13));</span><br><span style="color: hsl(120, 100%, 40%);">+                        &c->has_valid_string_termination, EDID_ASCII_STRING_LENGTH));</span><br><span>                  return 1;</span><br><span>            default:</span><br><span>                     printk(BIOS_SPEW,</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28659">change 28659</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.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://review.coreboot.org/28659"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I3934bd6965318cdffe5c636b01b3e0c4426e8d1d </div>
<div style="display:none"> Gerrit-Change-Number: 28659 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Georgi <pgeorgi@google.com> </div>