com php-src: Clear secret after use.: sapi/litespeed/lsapilib.c

Commit: 9fab0c8253187bef184d1653e15a4069ed656fd3 Author: George Wang <gwang@php.net> Tue, 8 Dec 2015 23:43:29 -0500 Committer: Anatol Belski <ab@php.net> Sat, 12 Dec 2015 15:37:09 +0100 Parents: 4f4400d7e5fae1138b40433a5ffbe941915fd004 Branches: PHP-7.0.1 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9fab0c8253187bef184d1653e15a4069ed656fd3 Log: Clear secret after use. Changed paths: M sapi/litespeed/lsapilib.c Diff: diff --git a/sapi/litespeed/lsapilib.c b/sapi/litespeed/lsapilib.c index d6d1c10..06437c2 100644 --- a/sapi/litespeed/lsapilib.c +++ b/sapi/litespeed/lsapilib.c @@ -128,7 +128,7 @@ static int s_pid_dump_debug_info = 0; LSAPI_Request g_req = { -1, -1 }; -static char s_pSecret[24]; +static char s_secret[24]; void Flush_RespBuf_r( LSAPI_Request * pReq ); @@ -670,7 +670,7 @@ static int readSecret( const char * pSecretFile ) close( fd ); return -1; } - if ( read( fd, s_pSecret, 16 ) < 16 ) + if ( read( fd, s_secret, 16 ) < 16 ) { fprintf( stderr, "LSAPI: failed to read secret from secret file: %s\n", pSecretFile ); close( fd ); @@ -682,7 +682,7 @@ static int readSecret( const char * pSecretFile ) int LSAPI_is_suEXEC_Daemon() { - if (( !s_uid )&&( s_pSecret[0] )) + if (( !s_uid )&&( s_secret[0] )) return 1; else return 0; @@ -877,7 +877,7 @@ static int lsapi_suexec_auth( LSAPI_Request *pReq, if ( len < 32 ) return -1; memmove( achMD5, pAuth + 16, 16 ); - memmove( pAuth + 16, s_pSecret, 16 ); + memmove( pAuth + 16, s_secret, 16 ); lsapi_MD5Init( &md5ctx ); lsapi_MD5Update( &md5ctx, (unsigned char *)pAuth, 32 ); lsapi_MD5Update( &md5ctx, (unsigned char *)pUgid, 8 ); @@ -1170,8 +1170,11 @@ static int readReq( LSAPI_Request * pReq ) pReq->m_reqState = LSAPI_ST_REQ_BODY | LSAPI_ST_RESP_HEADER; if ( !s_uid ) + { if ( lsapi_changeUGid( pReq ) ) return -1; + memset(s_secret, 0, sizeof(s_secret)); + } pReq->m_bufProcessed = packetLen; //OPTIMIZATION @@ -1191,7 +1194,7 @@ int LSAPI_Init(void) if ( !g_inited ) { s_uid = geteuid(); - s_pSecret[0] = 0; + s_secret[0] = 0; lsapi_signal(SIGPIPE, lsapi_sigpipe); lsapi_signal(SIGUSR1, lsapi_siguser1);