Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP2:GA
libX11
U_CVE-2021-31535.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File U_CVE-2021-31535.patch of Package libX11
The X protocol uses CARD16 values to represent the length so this would overflow. Signed-off-by: Matthieu Herrb <matthieu@herrb.eu> --- src/Font.c | 4 +++- src/FontInfo.c | 3 +++ src/FontNames.c | 3 +++ src/GetColor.c | 4 ++++ src/LoadFont.c | 4 ++++ src/LookupCol.c | 6 ++++-- src/ParseCol.c | 3 +++ src/QuExt.c | 5 +++++ src/SetFPath.c | 6 ++++++ src/SetHints.c | 7 +++++++ src/StNColor.c | 3 +++ src/StName.c | 7 ++++++- 12 files changed, 51 insertions(+), 4 deletions(-) Index: libX11-1.6.2/src/Font.c =================================================================== --- libX11-1.6.2.orig/src/Font.c +++ libX11-1.6.2/src/Font.c @@ -101,6 +101,8 @@ XFontStruct *XLoadQueryFont( XF86BigfontCodes *extcodes = _XF86BigfontCodes(dpy); #endif + if (name && strlen(name) > USHRT_MAX) + return NULL; if (_XF86LoadQueryLocaleFont(dpy, name, &font_result, (Font *)0)) return font_result; LockDisplay(dpy); @@ -661,7 +663,7 @@ int _XF86LoadQueryLocaleFont( if (!name) return 0; l = strlen(name); - if (l < 2 || name[l - 1] != '*' || name[l - 2] != '-') + if (l < 2 || name[l - 1] != '*' || name[l - 2] != '-' || l >= USHRT_MAX) return 0; charset = NULL; /* next three lines stolen from _XkbGetCharset() */ Index: libX11-1.6.2/src/FontInfo.c =================================================================== --- libX11-1.6.2.orig/src/FontInfo.c +++ libX11-1.6.2/src/FontInfo.c @@ -57,6 +57,9 @@ XFontStruct **info) /* RETURN */ register xListFontsReq *req; int j; + if (pattern && strlen(pattern) >= USHRT_MAX) + return NULL; + LockDisplay(dpy); GetReq(ListFontsWithInfo, req); req->maxNames = maxNames; Index: libX11-1.6.2/src/FontNames.c =================================================================== --- libX11-1.6.2.orig/src/FontNames.c +++ libX11-1.6.2/src/FontNames.c @@ -49,6 +49,9 @@ int *actualCount) /* RETURN */ register xListFontsReq *req; unsigned long rlen; + if (pattern && strlen(pattern) >= USHRT_MAX) + return NULL; + LockDisplay(dpy); GetReq(ListFonts, req); req->maxNames = maxNames; Index: libX11-1.6.2/src/GetColor.c =================================================================== --- libX11-1.6.2.orig/src/GetColor.c +++ libX11-1.6.2/src/GetColor.c @@ -27,6 +27,7 @@ in this Software without prior written a #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <limits.h> #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" @@ -48,6 +49,9 @@ XColor *exact_def) /* RETURN */ XcmsColor cmsColor_exact; Status ret; + if (colorname && strlen(colorname) >= USHRT_MAX) + return (0); + #ifdef XCMS /* * Let's Attempt to use Xcms and i18n approach to Parse Color Index: libX11-1.6.2/src/LoadFont.c =================================================================== --- libX11-1.6.2.orig/src/LoadFont.c +++ libX11-1.6.2/src/LoadFont.c @@ -27,6 +27,7 @@ in this Software without prior written a #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <limits.h> #include "Xlibint.h" Font @@ -38,6 +39,9 @@ XLoadFont ( Font fid; register xOpenFontReq *req; + if (name && strlen(name) >= USHRT_MAX) + return (0); + if (_XF86LoadQueryLocaleFont(dpy, name, (XFontStruct **)0, &fid)) return fid; Index: libX11-1.6.2/src/LookupCol.c =================================================================== --- libX11-1.6.2.orig/src/LookupCol.c +++ libX11-1.6.2/src/LookupCol.c @@ -27,6 +27,7 @@ in this Software without prior written a #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <limits.h> #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" @@ -46,6 +47,9 @@ XLookupColor ( XcmsCCC ccc; XcmsColor cmsColor_exact; + if (spec) n = (int) strlen (spec); else return 0; + if (n > USHRT_MAX) + return 0; #ifdef XCMS /* * Let's Attempt to use Xcms and i18n approach to Parse Color @@ -77,8 +81,6 @@ XLookupColor ( * Xcms and i18n methods failed, so lets pass it to the server * for parsing. */ - - n = strlen (spec); LockDisplay(dpy); GetReq (LookupColor, req); req->cmap = cmap; Index: libX11-1.6.2/src/ParseCol.c =================================================================== --- libX11-1.6.2.orig/src/ParseCol.c +++ libX11-1.6.2/src/ParseCol.c @@ -27,6 +27,7 @@ in this Software without prior written a #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <limits.h> #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" @@ -47,6 +48,8 @@ XParseColor ( if (!spec) return(0); n = strlen (spec); + if (n >= USHRT_MAX) + return(0); if (*spec == '#') { /* * RGB Index: libX11-1.6.2/src/QuExt.c =================================================================== --- libX11-1.6.2.orig/src/QuExt.c +++ libX11-1.6.2/src/QuExt.c @@ -27,6 +27,8 @@ in this Software without prior written a #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <limits.h> +#include <stdbool.h> #include "Xlibint.h" Bool @@ -54,6 +56,9 @@ XQueryExtension( return False; } + if (name && strlen(name) >= USHRT_MAX) + return false; + LockDisplay(dpy); GetReq(QueryExtension, req); req->nbytes = name ? strlen(name) : 0; Index: libX11-1.6.2/src/SetFPath.c =================================================================== --- libX11-1.6.2.orig/src/SetFPath.c +++ libX11-1.6.2/src/SetFPath.c @@ -26,6 +26,7 @@ in this Software without prior written a #ifdef HAVE_CONFIG_H #include <config.h> +#include <limits.h> #endif #include "Xlibint.h" @@ -49,6 +50,11 @@ XSetFontPath ( req->nFonts = ndirs; for (i = 0; i < ndirs; i++) { n += safestrlen (directories[i]) + 1; + if (n >= USHRT_MAX) { + UnlockDisplay(dpy); + SyncHandle(); + return 0; + } } nbytes = (n + 3) & ~3; req->length += nbytes >> 2; Index: libX11-1.6.2/src/SetHints.c =================================================================== --- libX11-1.6.2.orig/src/SetHints.c +++ libX11-1.6.2/src/SetHints.c @@ -49,6 +49,7 @@ SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <limits.h> #include <X11/Xlibint.h> #include <X11/Xutil.h> #include "Xatomtype.h" @@ -215,6 +216,8 @@ XSetCommand ( register char *buf, *bp; for (i = 0, nbytes = 0; i < argc; i++) { nbytes += safestrlen(argv[i]) + 1; + if (nbytes >= USHRT_MAX) + return 1; } if ((bp = buf = Xmalloc(nbytes))) { /* copy arguments into single buffer */ @@ -257,6 +260,8 @@ XSetStandardProperties ( if (name != NULL) XStoreName (dpy, w, name); + if (icon_string && safestrlen(icon_string) >= USHRT_MAX) + return 1; if (icon_string != NULL) { XChangeProperty (dpy, w, XA_WM_ICON_NAME, XA_STRING, 8, PropModeReplace, @@ -299,6 +304,8 @@ XSetClassHint( len_nm = safestrlen(classhint->res_name); len_cl = safestrlen(classhint->res_class); + if (len_nm + len_cl >= USHRT_MAX) + return 1; if ((class_string = s = Xmalloc(len_nm + len_cl + 2))) { if (len_nm) { strcpy(s, classhint->res_name); Index: libX11-1.6.2/src/StNColor.c =================================================================== --- libX11-1.6.2.orig/src/StNColor.c +++ libX11-1.6.2/src/StNColor.c @@ -27,6 +27,7 @@ in this Software without prior written a #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <limits.h> #include <stdio.h> #include "Xlibint.h" #include "Xcmsint.h" @@ -46,6 +47,8 @@ int flags) /* DoRed, DoGreen, DoBlue */ XcmsColor cmsColor_exact; XColor scr_def; + if (name && strlen(name) >= USHRT_MAX) + return 0; #ifdef XCMS /* * Let's Attempt to use Xcms approach to Parse Color Index: libX11-1.6.2/src/StName.c =================================================================== --- libX11-1.6.2.orig/src/StName.c +++ libX11-1.6.2/src/StName.c @@ -27,6 +27,7 @@ in this Software without prior written a #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <limits.h> #include <X11/Xlibint.h> #include <X11/Xatom.h> @@ -36,7 +37,9 @@ XStoreName ( Window w, _Xconst char *name) { - return XChangeProperty(dpy, w, XA_WM_NAME, XA_STRING, + if (name && strlen(name) >= USHRT_MAX) + return 0; + return XChangeProperty(dpy, w, XA_WM_NAME, XA_STRING, /* */ 8, PropModeReplace, (_Xconst unsigned char *)name, name ? strlen(name) : 0); } @@ -47,6 +50,8 @@ XSetIconName ( Window w, _Xconst char *icon_name) { + if (icon_name && strlen(icon_name) >= USHRT_MAX) + return 0; return XChangeProperty(dpy, w, XA_WM_ICON_NAME, XA_STRING, 8, PropModeReplace, (_Xconst unsigned char *)icon_name, icon_name ? strlen(icon_name) : 0);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
