qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

auth: remove AuthToIDFunc and associated functions. Not used anymore.

Browse Source 
And the current code for MitToId has a use-after-free() issue.
Advisory X41-2017-001: Multiple Vulnerabilities in X.Org
This commit is contained in:
matthieu 2017-02-28 18:32:53 +00:00
parent eb3d247766
commit e087a236fc
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xserver/os/auth.c
View File

@ -55,7 +55,6 @@ struct protocol {
AuthAddCFunc Add; /* new authorization data */ AuthAddCFunc Add; /* new authorization data */
AuthCheckFunc Check; /* verify client authorization data */ AuthCheckFunc Check; /* verify client authorization data */
AuthRstCFunc Reset; /* delete all authorization data entries */ AuthRstCFunc Reset; /* delete all authorization data entries */
AuthToIDFunc ToID; /* convert cookie to ID */
AuthFromIDFunc FromID; /* convert ID to cookie */ AuthFromIDFunc FromID; /* convert ID to cookie */
AuthRemCFunc Remove; /* remove a specific cookie */ AuthRemCFunc Remove; /* remove a specific cookie */
#ifdef XCSECURITY #ifdef XCSECURITY
@ -66,7 +65,7 @@ struct protocol {
static struct protocol protocols[] = { static struct protocol protocols[] = {
{(unsigned short) 18, "MIT-MAGIC-COOKIE-1", {(unsigned short) 18, "MIT-MAGIC-COOKIE-1",
MitAddCookie, MitCheckCookie, MitResetCookie, MitAddCookie, MitCheckCookie, MitResetCookie,
MitToID, MitFromID, MitRemoveCookie, MitFromID, MitRemoveCookie,
#ifdef XCSECURITY #ifdef XCSECURITY
MitGenerateCookie MitGenerateCookie
#endif #endif
@ -74,7 +73,7 @@ static struct protocol protocols[] = {
#ifdef HASXDMAUTH #ifdef HASXDMAUTH
{(unsigned short) 19, "XDM-AUTHORIZATION-1", {(unsigned short) 19, "XDM-AUTHORIZATION-1",
XdmAddCookie, XdmCheckCookie, XdmResetCookie, XdmAddCookie, XdmCheckCookie, XdmResetCookie,
XdmToID, XdmFromID, XdmRemoveCookie, XdmFromID, XdmRemoveCookie,
#ifdef XCSECURITY #ifdef XCSECURITY
NULL NULL
#endif #endif
@ -83,7 +82,7 @@ static struct protocol protocols[] = {
#ifdef SECURE_RPC #ifdef SECURE_RPC
{(unsigned short) 9, "SUN-DES-1", {(unsigned short) 9, "SUN-DES-1",
SecureRPCAdd, SecureRPCCheck, SecureRPCReset, SecureRPCAdd, SecureRPCCheck, SecureRPCReset,
SecureRPCToID, SecureRPCFromID, SecureRPCRemove, SecureRPCFromID, SecureRPCRemove,
#ifdef XCSECURITY #ifdef XCSECURITY
NULL NULL
#endif #endif

6
xserver/os/osdep.h
View File

@ -133,9 +133,6 @@ typedef int (*AuthRemCFunc) (AuthRemCArgs);
#define AuthRstCArgs void #define AuthRstCArgs void
typedef int (*AuthRstCFunc) (AuthRstCArgs); typedef int (*AuthRstCFunc) (AuthRstCArgs);
#define AuthToIDArgs unsigned short data_length, char *data
typedef XID (*AuthToIDFunc) (AuthToIDArgs);
typedef void (*OsCloseFunc) (ClientPtr); typedef void (*OsCloseFunc) (ClientPtr);
typedef int (*OsFlushFunc) (ClientPtr who, struct _osComm * oc, char *extraBuf, typedef int (*OsFlushFunc) (ClientPtr who, struct _osComm * oc, char *extraBuf,
@ -200,7 +197,6 @@ extern void GenerateRandomData(int len, char *buf);
/* in mitauth.c */ /* in mitauth.c */
extern XID MitCheckCookie(AuthCheckArgs); extern XID MitCheckCookie(AuthCheckArgs);
extern XID MitGenerateCookie(AuthGenCArgs); extern XID MitGenerateCookie(AuthGenCArgs);
extern XID MitToID(AuthToIDArgs);
extern int MitAddCookie(AuthAddCArgs); extern int MitAddCookie(AuthAddCArgs);
extern int MitFromID(AuthFromIDArgs); extern int MitFromID(AuthFromIDArgs);
extern int MitRemoveCookie(AuthRemCArgs); extern int MitRemoveCookie(AuthRemCArgs);
@ -209,7 +205,6 @@ extern int MitResetCookie(AuthRstCArgs);
/* in xdmauth.c */ /* in xdmauth.c */
#ifdef HASXDMAUTH #ifdef HASXDMAUTH
extern XID XdmCheckCookie(AuthCheckArgs); extern XID XdmCheckCookie(AuthCheckArgs);
extern XID XdmToID(AuthToIDArgs);
extern int XdmAddCookie(AuthAddCArgs); extern int XdmAddCookie(AuthAddCArgs);
extern int XdmFromID(AuthFromIDArgs); extern int XdmFromID(AuthFromIDArgs);
extern int XdmRemoveCookie(AuthRemCArgs); extern int XdmRemoveCookie(AuthRemCArgs);
@ -220,7 +215,6 @@ extern int XdmResetCookie(AuthRstCArgs);
#ifdef SECURE_RPC #ifdef SECURE_RPC
extern void SecureRPCInit(AuthInitArgs); extern void SecureRPCInit(AuthInitArgs);
extern XID SecureRPCCheck(AuthCheckArgs); extern XID SecureRPCCheck(AuthCheckArgs);
extern XID SecureRPCToID(AuthToIDArgs);
extern int SecureRPCAdd(AuthAddCArgs); extern int SecureRPCAdd(AuthAddCArgs);
extern int SecureRPCFromID(AuthFromIDArgs); extern int SecureRPCFromID(AuthFromIDArgs);
extern int SecureRPCRemove(AuthRemCArgs); extern int SecureRPCRemove(AuthRemCArgs);