diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-06 15:48:00 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-06 15:48:00 +0000 |
commit | acffe12698768a9bfe26d092672cc40dd04a6fbe (patch) | |
tree | e05fff21b556254e629c580730532ce66eb8fdc6 /channels | |
parent | e11a0c0ed9616fca4f238a79ae3c140c31e1776d (diff) |
clean up yesterday's security fix to not cause breakage when video mini frames are received
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@32566 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_iax2.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index a7f0c2303..9eeeb3634 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -6327,12 +6327,23 @@ static int socket_read(int *id, int fd, short events, void *cbdata) ast_log(LOG_WARNING, "midget packet received (%d of %zd min)\n", res, sizeof(*mh)); return 1; } - if ((res >= sizeof(*vh)) && ((vh->zeros == 0) && (ntohs(vh->callno) & 0x8000))) { + if ((vh->zeros == 0) && (ntohs(vh->callno) & 0x8000)) { + if (res < sizeof(*vh)) { + ast_log(LOG_WARNING, "Rejecting packet from '%s.%d' that is flagged as a video frame but is too short\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port)); + return 1; + } + /* This is a video frame, get call number */ fr->callno = find_callno(ntohs(vh->callno) & ~0x8000, dcallno, &sin, new, 1, fd); minivid = 1; - } else if ((res >= sizeof(*meta)) && (meta->zeros == 0) && !(ntohs(meta->metacmd) & 0x8000)) { + } else if ((meta->zeros == 0) && !(ntohs(meta->metacmd) & 0x8000)) { unsigned char metatype; + + if (res < sizeof(*meta)) { + ast_log(LOG_WARNING, "Rejecting packet from '%s.%d' that is flagged as a meta frame but is too short\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port)); + return 1; + } + /* This is a meta header */ switch(meta->metacmd) { case IAX_META_TRUNK: @@ -6454,20 +6465,16 @@ static int socket_read(int *id, int fd, short events, void *cbdata) return 1; } - /* if we got here and ->zeros contains zeros, this cannot be a valid - miniframe or full frame but it wasn't a valid video frame or meta - frame either, so we reject it - */ - if (vh->zeros == 0) { - ast_log(LOG_WARNING, "Rejecting packet from '%s.%d' that is flagged as a video or meta frame but is not properly formatted\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port)); - return 1; - } - #ifdef DEBUG_SUPPORT if (iaxdebug && (res >= sizeof(*fh))) iax_showframe(NULL, fh, 1, &sin, res - sizeof(*fh)); #endif - if ((res >= sizeof(*fh)) && ntohs(mh->callno) & IAX_FLAG_FULL) { + if (ntohs(mh->callno) & IAX_FLAG_FULL) { + if (res < sizeof(*fh)) { + ast_log(LOG_WARNING, "Rejecting packet from '%s.%d' that is flagged as a full frame but is too short\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port)); + return 1; + } + /* Get the destination call number */ dcallno = ntohs(fh->dcallno) & ~IAX_FLAG_RETRANS; /* Retrieve the type and subclass */ |