PR#257: Fix handling of selinux context when NULL - gssproxy

gssproxy

#257 Fix handling of selinux context when NULL

Merged 4 years ago by rharwood. Opened 4 years ago by simo.

simo/gssproxy selictx into master

Fix handling of selinux context when NULL

Simo Sorce • 4 years ago

383d370

src/gp_socket.c

file modified

+5 -2

		`@@ -122,7 +122,9 @@`
		`close(conn->us.sd);`
		`}`
		`free(conn->program);`
		`- SELINUX_context_free(conn->selinux_ctx);`
		`+ if (conn->selinux_ctx) {`
		`+ SELINUX_context_free(conn->selinux_ctx);`
		`+ }`
		`free(conn);`
		`}`

		`@@ -635,7 +637,8 @@`
		`conn->creds.ucred.uid,`
		`conn->creds.ucred.gid);`
		`}`
		`- if (conn->creds.type & CRED_TYPE_SELINUX) {`
		`+ if ((conn->creds.type & CRED_TYPE_SELINUX) &&`
		`+ (conn->selinux_ctx != NULL)) {`
		`GPDEBUG(" (context = %s)",`
		`SELINUX_context_str(conn->selinux_ctx));`
		`}`

simo commented 4 years ago

Fixes #256

slev commented 4 years ago

@simo, thank you! Looks good to me, but let me verify.

slev commented 4 years ago

brilliant!
There is no more crash.

rharwood commented 4 years ago

Worth noting that recent versions of libselinux do seem to correctly handle NULL here. However, since there are apparently versions that don't, we should still fix.

rharwood commented 4 years ago

Commit 3b77666 fixes this pull-request