Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

unix: fix usage of getpwnam_r and friends

Browse source 
These functions can return 0 code but still store NULL in result, if no matching group or username found.
Also the buffer of 64 size could be too small to store all string fields in result.
This commit is contained in:
Pavel Otchertsov 2021-03-24 09:39:16 +03:00 • committed by Andy Green
parent b9ee27f3c5
commit 9453d246d9
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/plat/unix/unix-caps.c
View file

@ -71,9 +71,9 @@ lws_plat_user_colon_group_to_ids(const char *u_colon_g, uid_t *puid, gid_t *pgid
#if defined(LWS_HAVE_GETGRNAM_R)
{
struct group gr;
char strs[64];
char strs[1024];
if (getgrnam_r(colon, &gr, strs, sizeof(strs), &g)) {
if (getgrnam_r(colon, &gr, strs, sizeof(strs), &g) || !g) {
#else
{
g = getgrnam(colon);
@ -89,9 +89,9 @@ lws_plat_user_colon_group_to_ids(const char *u_colon_g, uid_t *puid, gid_t *pgid
#if defined(LWS_HAVE_GETPWNAM_R)
{
struct passwd pr;
char strs[64];
char strs[1024];
if (getpwnam_r(u, &pr, strs, sizeof(strs), &p)) {
if (getpwnam_r(u, &pr, strs, sizeof(strs), &p) || !p) {
#else
{
p = getpwnam(u);
@ -118,9 +118,9 @@ lws_plat_drop_app_privileges(struct lws_context *context, int actually_drop)
if (context->groupname) {
#if defined(LWS_HAVE_GETGRNAM_R)
struct group gr;
char strs[64];
char strs[1024];
if (!getgrnam_r(context->groupname, &gr, strs, sizeof(strs), &g)) {
if (!getgrnam_r(context->groupname, &gr, strs, sizeof(strs), &g) && g) {
#else
g = getgrnam(context->groupname);
if (g) {
@ -141,9 +141,9 @@ lws_plat_drop_app_privileges(struct lws_context *context, int actually_drop)
if (context->username) {
#if defined(LWS_HAVE_GETPWNAM_R)
struct passwd pr;
char strs[64];
char strs[1024];
if (!getpwnam_r(context->username, &pr, strs, sizeof(strs), &p)) {
if (!getpwnam_r(context->username, &pr, strs, sizeof(strs), &p) && p) {
#else
p = getpwnam(context->username);
if (p) {
@ -168,9 +168,9 @@ lws_plat_drop_app_privileges(struct lws_context *context, int actually_drop)
if (context->gid && context->gid != (gid_t)-1l) {
#if defined(LWS_HAVE_GETGRGID_R)
struct group gr;
char strs[64];
char strs[1024];
if (getgrgid_r(context->gid, &gr, strs, sizeof(strs), &g)) {
if (getgrgid_r(context->gid, &gr, strs, sizeof(strs), &g) || !g) {
#else
g = getgrgid(context->gid);
if (!g) {
@ -199,9 +199,9 @@ lws_plat_drop_app_privileges(struct lws_context *context, int actually_drop)
if (context->uid && context->uid != (uid_t)-1l) {
#if defined(LWS_HAVE_GETPWUID_R)
struct passwd pr;
char strs[64];
char strs[1024];
if (getpwuid_r(context->uid, &pr, strs, sizeof(strs), &p)) {
if (getpwuid_r(context->uid, &pr, strs, sizeof(strs), &p) || !p) {
#else
p = getpwuid(context->uid);
if (!p) {