openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-08 10:19:00 +00:00
Code Issues Projects Releases Wiki Activity

xenocara xlock uses imsg for privsep.

Browse Source 
What changes:
- imsg_init becomes imsgbuf_init but imsgbuf_init can now fail
- Adding imsgbuf functions to hide the msgbuf functions:
        msgbuf_clear -> imsgbuf_clear
        msgbuf_write -> imsgbuf_write
- Also rename imsg_read to imsgbuf_read.
- Both imsgbuf_read and imsgbuf_write have simplified error handling.
  imsgbuf_write now returns 0 on success so that old wrong connection
  closed check must be removed
- Remove now official ibuf_get_string()

OK tb@ matthieu@
This commit is contained in:
claudio
2024-11-21 13:45:40 +00:00
parent 637c6fed82
commit 0d1a675fff
1 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/xlockmore/xlock/privsep.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: privsep.c,v 1.4 2024/01/22 10:13:34 claudio Exp $ */ /* $OpenBSD: privsep.c,v 1.5 2024/11/21 13:45:40 claudio Exp $ */
/* /*
* Copyright 2001 Niels Provos <provos@citi.umich.edu> * Copyright 2001 Niels Provos <provos@citi.umich.edu>
* All rights reserved. * All rights reserved.
@@ -83,7 +83,7 @@ pw_check(char *name, char *pass, char *style)
static int static int
send_cmd(struct imsgbuf *ibuf, char *user, char *pass, char *style) send_cmd(struct imsgbuf *ibuf, char *user, char *pass, char *style)
{ {
size_t n, datalen = 0; size_t datalen = 0;
struct ibuf *wbuf; struct ibuf *wbuf;
struct priv_cmd_hdr hdr; struct priv_cmd_hdr hdr;
@@ -120,31 +120,13 @@ send_cmd(struct imsgbuf *ibuf, char *user, char *pass, char *style)
} }
imsg_close(ibuf, wbuf); imsg_close(ibuf, wbuf);
if ((n = msgbuf_write(&ibuf->w)) == -1 && errno != EAGAIN) { if (imsgbuf_write(ibuf) == -1) {
warn("imsg_write"); warn("imsgbuf_write");
return -1; return -1;
} }
if (n == 0)
return -1;
return 0; return 0;
} }
static char *
ibuf_get_string(struct ibuf *buf, size_t len)
{
char *str;
if (ibuf_size(buf) < len) {
errno = EBADMSG;
return (NULL);
}
str = strndup(ibuf_data(buf), len);
if (str == NULL)
return (NULL);
buf->rpos += len;
return (str);
}
static int static int
receive_cmd(struct imsgbuf *ibuf, char **name, char **pass, char **style) receive_cmd(struct imsgbuf *ibuf, char **name, char **pass, char **style)
{ {
@@ -154,8 +136,8 @@ receive_cmd(struct imsgbuf *ibuf, char **name, char **pass, char **style)
ssize_t n, nread; ssize_t n, nread;
do { do {
if ((nread = imsg_read(ibuf)) == -1 && errno != EAGAIN) { if ((nread = imsgbuf_read(ibuf)) == -1) {
warn("imsg_read"); warn("imsgbuf_read");
return -1; return -1;
} }
if (nread == 0) { if (nread == 0) {
@@ -196,7 +178,7 @@ send_result(struct imsgbuf *ibuf, int result)
{ {
imsg_compose(ibuf, XLOCK_CHECKPW_RESULT, 0, 0, -1, imsg_compose(ibuf, XLOCK_CHECKPW_RESULT, 0, 0, -1,
&result, sizeof(int)); &result, sizeof(int));
return msgbuf_write(&ibuf->w); return imsgbuf_write(ibuf);
} }
static int static int
@@ -207,7 +189,7 @@ receive_result(struct imsgbuf *ibuf, int *presult)
struct imsg imsg; struct imsg imsg;
do { do {
if ((nread = imsg_read(ibuf)) == -1 && errno != EAGAIN) if ((nread = imsgbuf_read(ibuf)) == -1)
return -1; return -1;
if (nread == 0) if (nread == 0)
return -1; return -1;
@@ -244,7 +226,8 @@ priv_init(gid_t gid)
return -1; return -1;
} }
close(socks[0]); close(socks[0]);
imsg_init(&parent_ibuf, socks[1]); if (imsgbuf_init(&parent_ibuf, socks[1]) == -1)
return -1;
priv_inited = 1; priv_inited = 1;
return 0; return 0;
} }
@@ -253,7 +236,8 @@ priv_init(gid_t gid)
setproctitle("[priv]"); setproctitle("[priv]");
imsg_init(&child_ibuf, socks[0]); if (imsgbuf_init(&child_ibuf, socks[0]) == -1)
err(1, "imsgbuf_init");
if (unveil(_PATH_LOGIN_CONF, "r") == -1) if (unveil(_PATH_LOGIN_CONF, "r") == -1)
err(1, "unveil %s", _PATH_LOGIN_CONF); err(1, "unveil %s", _PATH_LOGIN_CONF);