AST-2012-008: Fix remote crash vulnerability in chan_skinny

When a skinny session is unregistered, the corresponding device pointer is set
to NULL in the channel private data.  If the client was not in the on-hook state
at the time the connection was closed, the device pointer can later be
dereferened if a message or channel event attempts to use a line's pointer to
said device.

The patches prevent this from occurring by checking the line's pointer in
message handlers and channel callbacks that can fire after an unregistration
attempt.

(closes issue ASTERISK-19905)
Reported by: Christoph Hebeisen
Tested by: mjordan, Damien Wedhorn
Patches:
  AST-2012-008-1.8.diff uploaded by mjordan (license 6283)
  AST-2012-008-10.diff uploaded by mjordan (licesen 6283)

git-svn-id: https://origsvn.digium.com/svn/asterisk/certified/branches/1.8.11@367846 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 5a6430372744b567f760d277d4f4e3ddfddc6163..5d965157cc830ea2b3e8dade1619af118a33b364 100644 (file)
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -2684,6 +2684,10 @@ static void update_connectedline(struct skinny_subchannel *sub, const void *data
        struct skinny_line *l = sub->parent;
        struct skinny_device *d = l->device;
 
+       if (!d) {
+               return;
+       }
+
        if (!c->caller.id.number.valid
                || ast_strlen_zero(c->caller.id.number.str)
                || !c->connected.id.number.valid
@@ -3817,6 +3821,11 @@ static void *skinny_ss(void *data)
        int res = 0;
        int loop_pause = 100;
 
+       if (!d) {
+               ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+               return NULL;
+       }
+
        ast_verb(3, "Starting simple switch on '%s@%s'\n", l->name, d->name);
 
        len = strlen(d->exten);
@@ -3920,7 +3929,7 @@ static int skinny_call(struct ast_channel *ast, char *dest, int timeout)
        struct skinny_line *l = sub->parent;
        struct skinny_device *d = l->device;
 
-       if (!d->registered) {
+       if (!d || !d->registered) {
                ast_log(LOG_ERROR, "Device not registered, cannot call %s\n", dest);
                return -1;
        }
@@ -3984,6 +3993,11 @@ static int skinny_hangup(struct ast_channel *ast)
        l = sub->parent;
        d = l->device;
 
+       if (!d) {
+               ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+               return 0;
+       }
+
        if (skinnydebug)
                ast_verb(3,"Hanging up %s/%d\n",d->name,sub->callid);
 
@@ -4381,7 +4395,13 @@ static int skinny_indicate(struct ast_channel *ast, int ind, const void *data, s
        struct skinny_subchannel *sub = ast->tech_pvt;
        struct skinny_line *l = sub->parent;
        struct skinny_device *d = l->device;
-       struct skinnysession *s = d->session;
+       struct skinnysession *s;
+
+       if (!d) {
+               ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+               return -1;
+       }
+       s = d->session;
 
        if (!s) {
                ast_log(LOG_NOTICE, "Asked to indicate '%s' condition on channel %s, but session does not exist.\n", control2str(ind), ast->name);
@@ -4615,8 +4635,13 @@ static int skinny_hold(struct skinny_subchannel *sub)
        struct skinny_device *d = l->device;
 
        /* Don't try to hold a channel that doesn't exist */
-       if (!sub || !sub->owner)
+       if (!sub || !sub->owner) {
                return 0;
+       }
+       if (!d) {
+               ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+               return 0;
+       }
 
        /* Channel needs to be put on hold */
        if (skinnydebug)
@@ -4642,8 +4667,13 @@ static int skinny_unhold(struct skinny_subchannel *sub)
        struct skinny_device *d = l->device;
 
        /* Don't try to unhold a channel that doesn't exist */
-       if (!sub || !sub->owner)
+       if (!sub || !sub->owner) {
                return 0;
+       }
+       if (!d) {
+               ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+               return 0;
+       }
 
        /* Channel is on hold, so we will unhold */
        if (skinnydebug)
@@ -4697,6 +4727,11 @@ static int handle_transfer_button(struct skinny_subchannel *sub)
        l = sub->parent;
        d = l->device;
 
+       if (!d) {
+               ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+               return -1;
+       }
+
        if (!sub->related) {
                /* Another sub has not been created so this must be first XFER press */
                if (!sub->onhold) {
@@ -4828,6 +4863,11 @@ static int handle_callforward_button(struct skinny_subchannel *sub, int cfwdtype
        struct ast_channel *c = sub->owner;
        pthread_t t;
 
+       if (!d) {
+               ast_log(LOG_WARNING, "Device for line %s is not registered.\n", l->name);
+               return 0;
+       }
+
        if (l->hookstate == SKINNY_ONHOOK) {
                l->hookstate = SKINNY_OFFHOOK;
                transmit_speaker_mode(d, SKINNY_SPEAKERON);