D51152.id157892.diff
No OneTemporary
Actions

Size

947 B

Referenced Files

None

Subscribers

None

D51152.id157892.diff
View Options

	diff --git a/usr.sbin/bluetooth/sdpd/server.c b/usr.sbin/bluetooth/sdpd/server.c
	--- a/usr.sbin/bluetooth/sdpd/server.c
	+++ b/usr.sbin/bluetooth/sdpd/server.c
	@@ -345,14 +345,12 @@
	return;
	}
	} else {
	- struct xucred cr;
	+ uid_t uid;
	+ gid_t gid;
	struct passwd *pw;

	/* Get peer's credentials */
	- memset(&cr, 0, sizeof(cr));
	- size = sizeof(cr);
	-
	- if (getsockopt(cfd, 0, LOCAL_PEERCRED, &cr, &size) < 0) {
	+ if (getpeereid(cfd, &uid, &gid) < 0) {
	log_err("Could not get peer's credentials. %s (%d)",
	strerror(errno), errno);
	close(cfd);
	@@ -360,12 +358,12 @@
	}

	/* Check credentials */
	- pw = getpwuid(cr.cr_uid);
	+ pw = getpwuid(uid);
	if (pw != NULL)
	priv = (strcmp(pw->pw_name, "root") == 0);
	else
	log_warning("Could not verify credentials for uid %d",
	- cr.cr_uid);
	+ uid);

	memcpy(&srv->req_sa.l2cap_bdaddr, NG_HCI_BDADDR_ANY,
	sizeof(srv->req_sa.l2cap_bdaddr));