'Re: [asterisk-dev] [Code Review]: Correct message array allocation issues in app_voicemail'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       asterisk-dev
Subject:    Re: [asterisk-dev] [Code Review]: Correct message array allocation issues in app_voicemail
From:       "opticron" <reviewboard () asterisk ! org>
Date:       2012-06-25 20:55:57
Message-ID: 20120625205557.28643.76908 () hotblack ! digium ! com
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]

> On June 22, 2012, 11:57 a.m., Mark Michelson wrote:
> > branches/1.8/apps/app_voicemail.c, lines 8029-8039
> > <https://reviewboard.asterisk.org/r/1994/diff/2/?file=29022#file29022line8029>
> > 
> > There's an access to vms->dh_arraysize here without a lock held.

Fixed.

- opticron

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/1994/#review6553
-----------------------------------------------------------

On June 20, 2012, 3:18 p.m., opticron wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviewboard.asterisk.org/r/1994/
> -----------------------------------------------------------
> 
> (Updated June 20, 2012, 3:18 p.m.)
> 
> 
> Review request for Asterisk Developers.
> 
> 
> Summary
> -------
> 
> This patch reworks the handling of array allocation and freeing to ensure that \
> freed memory is not used. 
> 
> This addresses bug AST-894.
> https://issues.asterisk.org/jira/browse/AST-894
> 
> 
> Diffs
> -----
> 
> branches/1.8/apps/app_voicemail.c 368806 
> 
> Diff: https://reviewboard.asterisk.org/r/1994/diff
> 
> 
> Testing
> -------
> 
> Poked through voicemail manually.  Testing has been performed on issue \
> ASTERISK-19923 and seems to have corrected the segfault in that case. 
> 
> Thanks,
> 
> opticron
> 
> 

[Attachment #5 (text/html)]

<html>
 <body>
  <div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
   <table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;">  <tr>
     <td>
      This is an automatically generated e-mail. To reply, visit:
      <a href="https://reviewboard.asterisk.org/r/1994/">https://reviewboard.asterisk.org/r/1994/</a>
  </td>
    </tr>
   </table>
   <br />

<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;">  <p style="margin-top: 0;">On June 22nd, 2012, 11:57 a.m., <b>Mark \
Michelson</b> wrote:</p>  <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">  

<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;">  <thead>
  <tr>
   <th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;">  <a \
href="https://reviewboard.asterisk.org/r/1994/diff/2/?file=29022#file29022line8029" \
style="color: black; font-weight: bold; text-decoration: \
underline;">branches/1.8/apps/app_voicemail.c</a>  <span style="font-weight: \
normal;">

     (Diff revision 2)

    </span>
   </th>
  </tr>
 </thead>

 <tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
  <tr>

   <td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">static \
int close_mailbox(struct vm_state *vms, struct ast_vm_user *vmu)</pre></td>

  </tr>
 </tbody>

 <tbody>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8024</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">	<span class="k">if</span> \
<span class="p">(</span><span class="n">vms</span><span class="o">-&gt;</span><span \
class="n">deleted</span><span class="p">)</span> <span class="p">{</span></pre></td>  \
<th bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">8027</font></th>  <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">	<span \
class="k">if</span> <span class="p">(</span><span class="n">vms</span><span \
class="o">-&gt;</span><span class="n">deleted</span><span class="p">)</span> <span \
class="p">{</span></pre></td>  </tr>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8025</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">		<span class="cm">/* Since we \
now expunge after each delete, deleting in reverse order</span></pre></td>  <th \
bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">8028</font></th>  <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">		<span \
class="cm">/* Since we now expunge after each delete, deleting in reverse \
order</span></pre></td>  </tr>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8026</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "><span class="cm">		 * ensures \
that no reordering occurs between each step. */</span></pre></td>  <th \
bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">8029</font></th>  <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "><span \
class="cm">		 * ensures that no reordering occurs between each step. \
*/</span></pre></td>  </tr>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8027</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">		<span \
class="n">last_msg_idx</span> <span class="o">=</span> <span \
class="n">vms</span><span class="o">-&gt;</span><span \
class="n">dh_arraysize</span><span class="p">;</span></pre></td>  <th \
bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">8030</font></th>  <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">		<span \
class="n">last_msg_idx</span> <span class="o">=</span> <span \
class="n">vms</span><span class="o">-&gt;</span><span \
class="n">dh_arraysize</span><span class="p">;</span></pre></td>  </tr>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8028</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">		<span class="k">for</span> \
<span class="p">(</span><span class="n">x</span> <span class="o">=</span> <span \
class="n">last_msg_idx</span> <span class="o">-</span> <span class="mi">1</span><span \
class="p">;</span> <span class="n">x</span> <span class="o">&gt;=</span> <span \
class="mi">0</span><span class="p">;</span> <span class="n">x</span><span \
class="o">--</span><span class="p">)</span> <span class="p">{</span></pre></td>  <th \
bgcolor="#f0f0f0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">8031</font></th>  <td bgcolor="#ffffff" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">		<span \
class="k">for</span> <span class="p">(</span><span class="n">x</span> <span \
class="o">=</span> <span class="n">last_msg_idx</span> <span class="o">-</span> <span \
class="mi">1</span><span class="p">;</span> <span class="n">x</span> <span \
class="o">&gt;=</span> <span class="mi">0</span><span class="p">;</span> <span \
class="n">x</span><span class="o">--</span><span class="p">)</span> <span \
class="p">{</span></pre></td>  </tr>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8029</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">			<span class="k">if</span> \
<span class="p">(</span><span class="n">vms</span><span class="o">-&gt;</span><span \
class="n">deleted</span><span class="p">[</span><span class="n">x</span><span \
class="p">])</span> <span class="p">{</span></pre></td>  <th bgcolor="#f0f0f0" \
style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8032</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">			<span class="k">if</span> \
<span class="p">(</span><span class="n">vms</span><span class="o">-&gt;</span><span \
class="n">deleted</span><span class="p">[</span><span class="n">x</span><span \
class="p">])</span> <span class="p">{</span></pre></td>  </tr>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8030</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">				<span \
class="n">ast_debug</span><span class="p">(</span><span class="mi">3</span><span \
class="p">,</span> <span class="s">&quot;IMAP delete of %d</span><span \
class="se">\n</span><span class="s">&quot;</span><span class="p">,</span> <span \
class="n">x</span><span class="p">);</span></pre></td>  <th bgcolor="#f0f0f0" \
style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8033</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">				<span \
class="n">ast_debug</span><span class="p">(</span><span class="mi">3</span><span \
class="p">,</span> <span class="s">&quot;IMAP delete of %d</span><span \
class="se">\n</span><span class="s">&quot;</span><span class="p">,</span> <span \
class="n">x</span><span class="p">);</span></pre></td>  </tr>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8031</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">				<span \
class="n">DELETE</span><span class="p">(</span><span class="n">vms</span><span \
class="o">-&gt;</span><span class="n">curdir</span><span class="p">,</span> <span \
class="n">x</span><span class="p">,</span> <span class="n">vms</span><span \
class="o">-&gt;</span><span class="n">fn</span><span class="p">,</span> <span \
class="n">vmu</span><span class="p">);</span></pre></td>  <th bgcolor="#f0f0f0" \
style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8034</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">				<span \
class="n">DELETE</span><span class="p">(</span><span class="n">vms</span><span \
class="o">-&gt;</span><span class="n">curdir</span><span class="p">,</span> <span \
class="n">x</span><span class="p">,</span> <span class="n">vms</span><span \
class="o">-&gt;</span><span class="n">fn</span><span class="p">,</span> <span \
class="n">vmu</span><span class="p">);</span></pre></td>  </tr>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8032</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">			<span \
class="p">}</span></pre></td>  <th bgcolor="#f0f0f0" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">8035</font></th>  <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; ">			<span class="p">}</span></pre></td>  </tr>

 </tbody>

 <tbody>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8033</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">		<span \
class="p">}</span></pre></td>  <th bgcolor="#f0f0f0" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">8036</font></th>  <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; ">		<span class="p">}</span></pre></td>  </tr>

  <tr>
    <th bgcolor="#f0f0f0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">8034</font></th>  <td bgcolor="#ffffff" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">	<span \
class="p">}</span></pre></td>  <th bgcolor="#f0f0f0" style="border-left: 1px solid \
#C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font \
size="2">8037</font></th>  <td bgcolor="#ffffff" width="50%"><pre style="font-size: \
8pt; line-height: 140%; margin: 0; ">	<span class="p">}</span></pre></td>  </tr>

 </tbody>

</table>

  <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">There&#39;s an access to \
vms-&gt;dh_arraysize here without a lock held.</pre>  </blockquote>

</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Fixed.</pre> <br />

<p>- opticron</p>

<br />
<p>On June 20th, 2012, 3:18 p.m., opticron wrote:</p>

<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('https://reviewboard.asterisk.org/media/rb/images/review_request_box_top_bg.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;">  <tr>
  <td>

<div>Review request for Asterisk Developers.</div>
<div>By opticron.</div>

<p style="color: grey;"><i>Updated June 20, 2012, 3:18 p.m.</i></p>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0">  <tr>
  <td>
   <pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">This patch reworks the handling of array allocation and freeing to \
ensure that freed memory is not used.</pre>  </td>
 </tr>
</table>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0">  <tr>
  <td>
   <pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Poked through voicemail manually.  Testing has been performed on issue \
ASTERISK-19923 and seems to have corrected the segfault in that case.</pre>  </td>
 </tr>
</table>

<div style="margin-top: 1.5em;">
 <b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>

 <a href="https://issues.asterisk.org/jira/browse/AST-894">AST-894</a>

</div>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">

 <li>branches/1.8/apps/app_voicemail.c <span style="color: grey">(368806)</span></li>

</ul>

<p><a href="https://reviewboard.asterisk.org/r/1994/diff/" style="margin-left: \
3em;">View Diff</a></p>

  </td>
 </tr>
</table>

  </div>
 </body>
</html>

--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

asterisk-dev mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/asterisk-dev

[prev in list] [next in list] [prev in thread] [next in thread] 