<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html lang="en"> <head> <meta content="text/html; charset=US-ASCII" http-equiv="Content-Type"> <title> GitLab </title> <style>img { max-width: 100%; height: auto; } </style> </head> <body> <div class="content"> <h3> Samuel Thibault pushed to branch master at <a href="https://gitlab.freedesktop.org/slirp/libslirp">slirp / libslirp</a> </h3> <h4> Commits: </h4> <ul> <li> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/d620bac888923524f8b8407dbf35f6d2b3b7ddb2">d620bac8</a> <div> by Dr. David Alan Gilbert at 2020-07-17T18:27:24+01:00 </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">ip_stripoptions use memmove ip_stripoptions is moving data long in the same buffer; that's undefined with memcpy, use memmove. Buglink: https://bugs.launchpad.net/qemu/+bug/1878043 Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> </pre> </li> <li> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/commit/a4e41a7e1d6a3a1aab972b36f8a6cdf570bb82b7">a4e41a7e</a> <div> by Samuel Thibault at 2020-07-17T17:34:24+00:00 </div> <pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Merge branch 'lp1878043' into 'master' ip_stripoptions use memmove See merge request slirp/libslirp!47</pre> </li> </ul> <h4>1 changed file:</h4> <ul> <li class="file-stats"> <a href="#558127ecfd507cb3b15211b6d51870316e30b841"> src/ip_input.c </a> </li> </ul> <h4>Changes:</h4> <li id="558127ecfd507cb3b15211b6d51870316e30b841"> <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/compare/73336e08902a7e826f7d960453df037380266186...a4e41a7e1d6a3a1aab972b36f8a6cdf570bb82b7#558127ecfd507cb3b15211b6d51870316e30b841">src/ip_input.c</a> <hr> <table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0"> <tr class="line_holder match" id="" style="line-height: 1.6;"> <td class="diff-line-num unfold js-unfold old_line" data-linenumber="454" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="diff-line-num unfold js-unfold new_line" data-linenumber="454" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td> <td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -454,7 +454,7 @@ void ip_stripoptions(register struct mbuf *m, struct mbuf *mopt)</td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="454" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 454 </td> <td class="diff-line-num new_line" data-linenumber="454" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 454 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> olen = (ip->ip_hl << 2) - sizeof(struct ip); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="455" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 455 </td> <td class="diff-line-num new_line" data-linenumber="455" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 455 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> opts = (char *)(ip + 1); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="456" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 456 </td> <td class="diff-line-num new_line" data-linenumber="456" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 456 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> i = m->m_len - (sizeof(struct ip) + olen); </pre> </td> </tr> <tr class="line_holder old" id="" style="line-height: 1.6;"> <td class="diff-line-num old old_line" data-linenumber="457" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> 457 </td> <td class="diff-line-num new_line old" data-linenumber="457" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc"> </td> <td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb"> <pre style="margin: 0;">- memcpy(opts, opts + olen, (unsigned)i); </pre> </td> </tr> <tr class="line_holder new" id="" style="line-height: 1.6;"> <td class="diff-line-num new old_line" data-linenumber="458" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> </td> <td class="diff-line-num new new_line" data-linenumber="457" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6"> 457 </td> <td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0"> <pre style="margin: 0;">+ memmove(opts, opts + olen, (unsigned)i); </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="458" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 458 </td> <td class="diff-line-num new_line" data-linenumber="458" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 458 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> m->m_len -= olen; </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="459" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 459 </td> <td class="diff-line-num new_line" data-linenumber="459" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 459 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> </pre> </td> </tr> <tr class="line_holder" id="" style="line-height: 1.6;"> <td class="diff-line-num old_line" data-linenumber="460" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 460 </td> <td class="diff-line-num new_line" data-linenumber="460" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa"> 460 </td> <td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;"> <pre style="margin: 0;"> ip->ip_hl = sizeof(struct ip) >> 2; </pre> </td> </tr> </table> </li> </div> <div class="footer" style="margin-top: 10px;"> — <a href="https://gitlab.freedesktop.org/slirp/libslirp/-/compare/73336e08902a7e826f7d960453df037380266186...a4e41a7e1d6a3a1aab972b36f8a6cdf570bb82b7">View it on GitLab</a>. You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings. </div> </body> </html>