generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Security fix for CERT issue VU#922681

Browse Source 
This patch addresses three possible buffer overflows in function
unique_service_name(). The three issues have the folowing CVE
numbers:

CVE-2012-5958 Issue #2: Stack buffer overflow of Tempbuf
CVE-2012-5959 Issue #4: Stack buffer overflow of Event->UDN
CVE-2012-5960 Issue #8: Stack buffer overflow of Event->UDN

Notice that the following issues have already been dealt by previous
work:

CVE-2012-5961 Issue #1: Stack buffer overflow of Evt->UDN
CVE-2012-5962 Issue #3: Stack buffer overflow of Evt->DeviceType
CVE-2012-5963 Issue #5: Stack buffer overflow of Event->UDN
CVE-2012-5964 Issue #6: Stack buffer overflow of Event->DeviceType
CVE-2012-5965 Issue #7: Stack buffer overflow of Event->DeviceType
This commit is contained in:
Marcelo Roberto Jimenez 2012-12-04 16:36:16 -02:00
parent 40e90e89fc
commit f015a132e8
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -2,6 +2,26 @@
Version 1.6.18 Version 1.6.18
******************************************************************************* *******************************************************************************
2012-12-06 Marcelo Roberto Jimenez <mroberto(at)users.sourceforge.net>
Security fix for CERT issue VU#922681
This patch addresses three possible buffer overflows in function
unique_service_name(). The three issues have the folowing CVE numbers:
CVE-2012-5958 Issue #2: Stack buffer overflow of Tempbuf
CVE-2012-5959 Issue #4: Stack buffer overflow of Event->UDN
CVE-2012-5960 Issue #8: Stack buffer overflow of Event->UDN
Notice that the following issues have already been dealt by previous
work:
CVE-2012-5961 Issue #1: Stack buffer overflow of Evt->UDN
CVE-2012-5962 Issue #3: Stack buffer overflow of Evt->DeviceType
CVE-2012-5963 Issue #5: Stack buffer overflow of Event->UDN
CVE-2012-5964 Issue #6: Stack buffer overflow of Event->DeviceType
CVE-2012-5965 Issue #7: Stack buffer overflow of Event->DeviceType
2012-06-19 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com> 2012-06-19 Yoichi NAKAYAMA <yoichi.nakayama(at)gmail.com>
Fix memory leak and access violation in UpnpSendAction(Ex)Async. Fix memory leak and access violation in UpnpSendAction(Ex)Async.

18
upnp/src/ssdp/ssdp_server.c
View File

@ -467,16 +467,16 @@ int unique_service_name(char *cmd, SsdpEvent *Evt)
else else
return -1; return -1;
if (ptr3 != NULL) { if (ptr3 != NULL) {
if (strlen("uuid:") + strlen(ptr3 + 1) >= sizeof(Evt->UDN)) if (strlen("uuid:") + strlen(ptr3 + 1) >= sizeof Evt->UDN)
return -1; return -1;
snprintf(Evt->UDN, sizeof(Evt->UDN), "uuid:%s", snprintf(Evt->UDN, sizeof Evt->UDN, "uuid:%s", ptr3 + 1);
ptr3 + 1);
} }
else else
return -1; return -1;
ptr1 = strstr(cmd, ":"); ptr1 = strstr(cmd, ":");
if (ptr1 != NULL) { if (ptr1 != NULL) {
n = (size_t)ptr3 - (size_t)ptr1; n = (size_t)ptr3 - (size_t)ptr1;
n = n >= sizeof TempBuf ? sizeof TempBuf - 1 : n;
strncpy(TempBuf, ptr1, n); strncpy(TempBuf, ptr1, n);
TempBuf[n] = '\0'; TempBuf[n] = '\0';
if (strlen("urn") + strlen(TempBuf) >= sizeof(Evt->DeviceType)) if (strlen("urn") + strlen(TempBuf) >= sizeof(Evt->DeviceType))
@ -490,27 +490,28 @@ int unique_service_name(char *cmd, SsdpEvent *Evt)
if ((TempPtr = strstr(cmd, "uuid")) != NULL) { if ((TempPtr = strstr(cmd, "uuid")) != NULL) {
if ((Ptr = strstr(cmd, "::")) != NULL) { if ((Ptr = strstr(cmd, "::")) != NULL) {
n = (size_t)Ptr - (size_t)TempPtr; n = (size_t)Ptr - (size_t)TempPtr;
n = n >= sizeof Evt->UDN ? sizeof Evt->UDN - 1 : n;
strncpy(Evt->UDN, TempPtr, n); strncpy(Evt->UDN, TempPtr, n);
Evt->UDN[n] = '\0'; Evt->UDN[n] = '\0';
} else { } else {
memset(Evt->UDN, 0, sizeof(Evt->UDN)); memset(Evt->UDN, 0, sizeof(Evt->UDN));
strncpy(Evt->UDN, TempPtr, sizeof(Evt->UDN) - 1); strncpy(Evt->UDN, TempPtr, sizeof Evt->UDN - 1);
} }
CommandFound = 1; CommandFound = 1;
} }
if (strstr(cmd, "urn:") != NULL && strstr(cmd, ":service:") != NULL) { if (strstr(cmd, "urn:") != NULL && strstr(cmd, ":service:") != NULL) {
if ((TempPtr = strstr(cmd, "urn")) != NULL) { if ((TempPtr = strstr(cmd, "urn")) != NULL) {
memset(Evt->ServiceType, 0, sizeof(Evt->ServiceType)); memset(Evt->ServiceType, 0, sizeof Evt->ServiceType);
strncpy(Evt->ServiceType, TempPtr, strncpy(Evt->ServiceType, TempPtr,
sizeof(Evt->ServiceType) - 1); sizeof Evt->ServiceType - 1);
CommandFound = 1; CommandFound = 1;
} }
} }
if (strstr(cmd, "urn:") != NULL && strstr(cmd, ":device:") != NULL) { if (strstr(cmd, "urn:") != NULL && strstr(cmd, ":device:") != NULL) {
if ((TempPtr = strstr(cmd, "urn")) != NULL) { if ((TempPtr = strstr(cmd, "urn")) != NULL) {
memset(Evt->DeviceType, 0, sizeof(Evt->DeviceType)); memset(Evt->DeviceType, 0, sizeof Evt->DeviceType);
strncpy(Evt->DeviceType, TempPtr, strncpy(Evt->DeviceType, TempPtr,
sizeof(Evt->DeviceType) - 1); sizeof Evt->DeviceType - 1);
CommandFound = 1; CommandFound = 1;
} }
} }
@ -518,6 +519,7 @@ int unique_service_name(char *cmd, SsdpEvent *Evt)
/* Everything before "::upnp::rootdevice" is the UDN. */ /* Everything before "::upnp::rootdevice" is the UDN. */
if (TempPtr != cmd) { if (TempPtr != cmd) {
n = (size_t)TempPtr - (size_t)cmd; n = (size_t)TempPtr - (size_t)cmd;
n = n >= sizeof Evt->UDN ? sizeof Evt->UDN - 1 : n;
strncpy(Evt->UDN, cmd, n); strncpy(Evt->UDN, cmd, n);
Evt->UDN[n] = 0; Evt->UDN[n] = 0;
CommandFound = 1; CommandFound = 1;