app_voicemail: Fix unchecked bounds of myArray in IMAP_STORAGE.
authorWalter Doekes <walter+asterisk@wjd.nu>
Thu, 30 Oct 2014 09:21:42 +0000 (09:21 +0000)
committerWalter Doekes <walter+asterisk@wjd.nu>
Thu, 30 Oct 2014 09:21:42 +0000 (09:21 +0000)
In update_messages_by_imapuser(), messages were appended to a finite
array which resulted in a crash when an IMAP mailbox contained more
than 256 entries. This memory is now dynamically increased as needed.

Observe that this patch adds a bunch of XXX's to questionable code. See
the review (url below) for more information.

ASTERISK-24190 #close
Reported by: Nick Adams
Tested by: Nick Adams

Review: https://reviewboard.asterisk.org/r/4126/
........

Merged revisions 426691 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 426692 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 426696 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 426702 from http://svn.asterisk.org/svn/asterisk/branches/13

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@426706 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

index c881e49..af4e7f0 100644 (file)
@@ -861,7 +861,8 @@ struct vm_state {
 #ifdef IMAP_STORAGE
        ast_mutex_t lock;
        int updated;                         /*!< decremented on each mail check until 1 -allows delay */
-       long msgArray[VMSTATE_MAX_MSG_ARRAY];
+       long *msgArray;
+       unsigned msg_array_max;
        MAILSTREAM *mailstream;
        int vmArrayIndex;
        char imapuser[80];                   /*!< IMAP server login */
@@ -2440,6 +2441,7 @@ static int __messagecount(const char *context, const char *mailbox, const char *
                free_user(vmu);
                return -1;
        }
+       ast_assert(msgnum < vms->msg_array_max);
 
        /* check if someone is accessing this box right now... */
        vms_p = get_vm_state_by_imapuser(vmu->imapuser, 1);
@@ -3081,6 +3083,17 @@ static void update_messages_by_imapuser(const char *user, unsigned long number)
        }
 
        ast_debug(3, "saving mailbox message number %lu as message %d. Interactive set to %d\n", number, vms->vmArrayIndex, vms->interactive);
+
+       /* Ensure we have room for the next message. */
+       if (vms->vmArrayIndex >= vms->msg_array_max) {
+               long *new_mem = ast_realloc(vms->msgArray, 2 * vms->msg_array_max * sizeof(long));
+               if (!new_mem) {
+                       return;
+               }
+               vms->msgArray = new_mem;
+               vms->msg_array_max *= 2;
+       }
+
        vms->msgArray[vms->vmArrayIndex++] = number;
 }
 
@@ -3358,6 +3371,7 @@ static struct vm_state *create_vm_state_from_user(struct ast_vm_user *vmu)
                return vms_p;
        }
        ast_debug(5, "Adding new vmstate for %s\n", vmu->imapuser);
+       /* XXX: Is this correctly freed always? */
        if (!(vms_p = ast_calloc(1, sizeof(*vms_p))))
                return NULL;
        ast_copy_string(vms_p->imapuser, vmu->imapuser, sizeof(vms_p->imapuser));
@@ -3472,6 +3486,7 @@ static void vmstate_insert(struct vm_state *vms)
                        vms->newmessages = altvms->newmessages;
                        vms->oldmessages = altvms->oldmessages;
                        vms->vmArrayIndex = altvms->vmArrayIndex;
+                       /* XXX: no msgArray copying? */
                        vms->lastmsg = altvms->lastmsg;
                        vms->curmsg = altvms->curmsg;
                        /* get a pointer to the persistent store */
@@ -3530,10 +3545,14 @@ static void vmstate_delete(struct vm_state *vms)
        
        if (vc) {
                ast_mutex_destroy(&vc->vms->lock);
+               ast_free(vc->vms->msgArray);
+               vc->vms->msgArray = NULL;
+               vc->vms->msg_array_max = 0;
+               /* XXX: is no one supposed to free vms itself? */
                ast_free(vc);
-       }
-       else
+       } else {
                ast_log(AST_LOG_ERROR, "No vmstate found for user:%s, mailbox %s\n", vms->imapuser, vms->username);
+       }
 }
 
 static void set_update(MAILSTREAM * stream)
@@ -3555,11 +3574,13 @@ static void set_update(MAILSTREAM * stream)
 
 static void init_vm_state(struct vm_state *vms)
 {
-       int x;
-       vms->vmArrayIndex = 0;
-       for (x = 0; x < VMSTATE_MAX_MSG_ARRAY; x++) {
-               vms->msgArray[x] = 0;
+       vms->msg_array_max = VMSTATE_MAX_MSG_ARRAY;
+       vms->msgArray = ast_calloc(vms->msg_array_max, sizeof(long));
+       if (!vms->msgArray) {
+               /* Out of mem? This can't be good. */
+               vms->msg_array_max = 0;
        }
+       vms->vmArrayIndex = 0;
        ast_mutex_init(&vms->lock);
 }