<!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=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
</head>
<body>
<style type="text/css">
img {
max-width: 100%; height: auto;
}
</style>
<div class="content">
<h3>
Daniel Fox Franke pushed to branch master
at <a href="https://gitlab.com/NTPsec/ntpsec">NTPsec / ntpsec</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.com/NTPsec/ntpsec/commit/7ebb9a34cd94d9df40a503c0d767a7cfb1d21a9f">7ebb9a34</a></strong>
<div>
<span>by Daniel Fox Franke</span>
<i>at 2016-06-02T13:12:05-04:00</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap">Add a comment clarifying control flow in process_packet()
The analysis of CVE-2016-4954 in my previous commit message was
incorrect; there are indeed (minor) security implications to that bug
because the tardily-performed sanity check covers more than I thought.</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#620f2ecad2bb6f74b2fcd0134963a841" style="text-decoration: none">
ntpd/ntp_proto.c
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="620f2ecad2bb6f74b2fcd0134963a841">
<a href="https://gitlab.com/NTPsec/ntpsec/commit/7ebb9a34cd94d9df40a503c0d767a7cfb1d21a9f#diff-0"><strong>ntpd/ntp_proto.c</strong></a>
<hr>
<table class="code white" style="-premailer-cellpadding: 0; -premailer-cellspacing: 0; -premailer-width: 100%; background: #fff; border: none; border-collapse: separate; color: #333; font-family: monospace; margin: 0; padding: 0; width: 100%" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match">
<td class="diff-line-num js-unfold old_line unfold" data-linenumber="1260" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
...
</td>
<td class="diff-line-num js-unfold new_line unfold" data-linenumber="1260" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
...
</td>
<td class="line_content match" style="background: #fafafa; border: none; color: rgba(0,0,0,0.3); display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fafafa">@@ -1260,9 +1260,10 @@ process_packet(</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1260" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1260
</td>
<td class="new_line diff-line-num" data-linenumber="1260" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1260
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span class="line"> <span class="n" style="color: #333">peer</span><span class="o" style="font-weight: bold">-></span><span class="n" style="color: #333">flash</span> <span class="o" style="font-weight: bold">|=</span> <span class="n" style="color: #333">BOGON7</span><span class="p">;</span> <span class="cm" style="color: #998; font-style: italic">/* bad header */</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1261" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1261
</td>
<td class="new_line diff-line-num" data-linenumber="1261" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1261
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span class="line"></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1262" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1262
</td>
<td class="new_line diff-line-num" data-linenumber="1262" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1262
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span class="line"> <span class="cm" style="color: #998; font-style: italic">/*</span></span>
</td>
</tr>
<tr class="line_holder old">
<td class="diff-line-num old old_line" data-linenumber="1263" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
1263
</td>
<td class="diff-line-num new_line old" data-linenumber="1263" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span class="line"><span class="cm" style="color: #998; font-style: italic"> * If any tests fail at this point, the packet is discarded.</span></span>
</td>
</tr>
<tr class="line_holder old">
<td class="diff-line-num old old_line" data-linenumber="1263" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
1264
</td>
<td class="diff-line-num new_line old" data-linenumber="1263" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span class="line"><span class="cm" style="color: #998; font-style: italic"> * Note that some flashers may have already been set in the</span></span>
</td>
</tr>
<tr class="line_holder old">
<td class="diff-line-num old old_line" data-linenumber="1263" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
1265
</td>
<td class="diff-line-num new_line old" data-linenumber="1263" style="background: #f9d7dc; border-color: #fac5cd; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content noteable_line old" style="background: #fbe9eb; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fbe9eb"> <span class="line"><span class="cm" style="color: #998; font-style: italic"> * receive() routine.</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="1263" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1263" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1263
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span class="line"><span class="cm" style="color: #998; font-style: italic"> * If any tests have failed at this point, the packet is</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="1264" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1264" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1264
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span class="line"><span class="cm" style="color: #998; font-style: italic"> * discarded. Note that this check covers both the bits that</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="1265" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1265" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1265
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span class="line"><span class="cm" style="color: #998; font-style: italic"> * may have been set immediately above, as well as some that</span></span>
</td>
</tr>
<tr class="line_holder new">
<td class="diff-line-num new old_line" data-linenumber="1266" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1266" style="background: #ddfbe6; border-color: #c7f0d2; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#ddfbe6">
1266
</td>
<td class="line_content new noteable_line" style="background: #ecfdf0; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#ecfdf0"> <span class="line"><span class="cm" style="color: #998; font-style: italic"> * may have been set earlier in the receive() routine.</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1267" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1266
</td>
<td class="new_line diff-line-num" data-linenumber="1267" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1267
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span class="line"><span class="cm" style="color: #998; font-style: italic"> */</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1268" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1267
</td>
<td class="new_line diff-line-num" data-linenumber="1268" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1268
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span class="line"> <span class="k" style="font-weight: bold">if</span> <span class="p">(</span><span class="n" style="color: #333">peer</span><span class="o" style="font-weight: bold">-></span><span class="n" style="color: #333">flash</span> <span class="o" style="font-weight: bold">&</span> <span class="n" style="color: #333">PKT_BOGON_MASK</span><span class="p">)</span> <span class="p">{</span></span>
</td>
</tr>
<tr class="line_holder">
<td class="old_line diff-line-num" data-linenumber="1269" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1268
</td>
<td class="new_line diff-line-num" data-linenumber="1269" style="background: #fafafa; border-color: #f0f0f0; border-right-width: 1px; border-style: none solid none none; color: rgba(0,0,0,0.3); font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; max-width: 50px; min-width: 35px; padding: 0 5px; text-align: right; width: 35px" align="right" bgcolor="#fafafa">
1269
</td>
<td class="line_content noteable_line" style="background: #fff; border: none; color: #333; display: block; font-family: monospace; font-size: 13px; line-height: 1.5; margin: 0; padding: 0 0.5em; white-space: pre" bgcolor="#fff"> <span class="line"> <span class="n" style="color: #333">peer</span><span class="o" style="font-weight: bold">-></span><span class="n" style="color: #333">seldisptoolarge</span><span class="o" style="font-weight: bold">++</span><span class="p">;</span></span>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px">
<p style="color: #777; font-size: small">
—
<br>
<a href="https://gitlab.com/NTPsec/ntpsec/commit/7ebb9a34cd94d9df40a503c0d767a7cfb1d21a9f">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.com.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.com/NTPsec/ntpsec/commit/7ebb9a34cd94d9df40a503c0d767a7cfb1d21a9f"}}</script>
</p>
</div>
</body>
</html>