summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSumit Bose <sbose@redhat.com>2009-09-23 13:54:49 +0200
committerStephen Gallagher <sgallagh@redhat.com>2009-09-25 09:03:30 -0400
commit6cec00b7fe2aed71b8df21d2a0d97df8b448cc85 (patch)
tree886b9ef3b2a474eee30f17747b7da121fa03b281
parentf3cdf684be66f04b8607b1254f1b305aecdfa222 (diff)
downloadsssd-6cec00b7fe2aed71b8df21d2a0d97df8b448cc85.tar.gz
sssd-6cec00b7fe2aed71b8df21d2a0d97df8b448cc85.tar.xz
sssd-6cec00b7fe2aed71b8df21d2a0d97df8b448cc85.zip
fix possible short reads in kerberos provider
-rw-r--r--server/providers/krb5/krb5_auth.c23
-rw-r--r--server/providers/krb5/krb5_child.c38
2 files changed, 46 insertions, 15 deletions
diff --git a/server/providers/krb5/krb5_auth.c b/server/providers/krb5/krb5_auth.c
index 7510c0665..05f21be18 100644
--- a/server/providers/krb5/krb5_auth.c
+++ b/server/providers/krb5/krb5_auth.c
@@ -410,6 +410,7 @@ static struct tevent_req *read_pipe_send(TALLOC_CTX *memctx,
state->fd = fd;
state->buf = talloc_array(state, uint8_t, MAX_CHILD_MSG_SIZE);
+ state->len = 0;
if (state->buf == NULL) goto fail;
fde = tevent_add_fd(ev, state, fd, TEVENT_FD_READ,
@@ -434,22 +435,34 @@ static void read_pipe_done(struct tevent_context *ev, struct tevent_fd *fde,
struct read_pipe_state *state = tevent_req_data(req, struct read_pipe_state);
if (flags & TEVENT_FD_WRITE) {
- DEBUG(1, ("client_response_handler called with TEVENT_FD_WRITE, this should not happen.\n"));
+ DEBUG(1, ("read_pipe_done called with TEVENT_FD_WRITE, this should not happen.\n"));
tevent_req_error(req, EINVAL);
return;
}
- size = read(state->fd, state->buf, talloc_get_size(state->buf));
+ size = read(state->fd, state->buf + state->len, talloc_get_size(state->buf) - state->len);
if (size == -1) {
if (errno == EAGAIN || errno == EINTR) return;
DEBUG(1, ("read failed [%d][%s].\n", errno, strerror(errno)));
tevent_req_error(req, errno);
return;
+ } else if (size > 0) {
+ state->len += size;
+ if (state->len > talloc_get_size(state->buf)) {
+ DEBUG(1, ("read to much, this should never happen.\n"));
+ tevent_req_error(req, EINVAL);
+ return;
+ }
+ return;
+ } else if (size == 0) {
+ tevent_req_done(req);
+ return;
+ } else {
+ DEBUG(1, ("unexpected return value of read [%d].\n", size));
+ tevent_req_error(req, EINVAL);
+ return;
}
- state->len = size;
- tevent_req_done(req);
- return;
}
static ssize_t read_pipe_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
diff --git a/server/providers/krb5/krb5_child.c b/server/providers/krb5/krb5_child.c
index 4f3a62c65..6f698400b 100644
--- a/server/providers/krb5/krb5_child.c
+++ b/server/providers/krb5/krb5_child.c
@@ -33,6 +33,8 @@
#include "providers/krb5/krb5_auth.h"
#include "providers/krb5/krb5_utils.h"
+#define IN_BUF_SIZE 512
+
struct krb5_req {
krb5_context ctx;
krb5_ccache cc;
@@ -598,6 +600,7 @@ int main(int argc, char *argv[])
{
uint8_t *buf = NULL;
int ret;
+ ssize_t len = 0;
struct pam_data *pd = NULL;
struct krb5_req *kr = NULL;
char *ccname;
@@ -606,32 +609,43 @@ int main(int argc, char *argv[])
pd = talloc(NULL, struct pam_data);
- buf = talloc_size(pd, sizeof(uint8_t)*512);
+ buf = talloc_size(pd, sizeof(uint8_t)*IN_BUF_SIZE);
if (buf == NULL) {
DEBUG(1, ("malloc failed.\n"));
_exit(-1);
}
- ret = read(STDIN_FILENO, buf, 512);
- if (ret == -1) {
- DEBUG(1, ("read failed [%d][%s].\n", errno, strerror(errno)));
- talloc_free(pd);
- exit(-1);
+ while ((ret = read(STDIN_FILENO, buf + len, IN_BUF_SIZE - len)) != 0) {
+ if (ret == -1) {
+ if (errno == EINTR || errno == EAGAIN) {
+ continue;
+ }
+ DEBUG(1, ("read failed [%d][%s].\n", errno, strerror(errno)));
+ goto fail;
+ } else if (ret > 0) {
+ len += ret;
+ if (len > IN_BUF_SIZE) {
+ DEBUG(1, ("read too much, this should never happen.\n"));
+ goto fail;
+ }
+ continue;
+ } else {
+ DEBUG(1, ("unexpected return code of read [%d].\n", ret));
+ goto fail;
+ }
}
close(STDIN_FILENO);
ret = unpack_buffer(buf, ret, pd, &ccname);
if (ret != EOK) {
DEBUG(1, ("unpack_buffer failed.\n"));
- talloc_free(pd);
- exit(-1);
+ goto fail;
}
ret = krb5_setup(pd, pd->upn, &kr);
if (ret != EOK) {
DEBUG(1, ("krb5_setup failed.\n"));
- talloc_free(pd);
- exit(-1);
+ goto fail;
}
kr->ccname = ccname;
@@ -644,4 +658,8 @@ int main(int argc, char *argv[])
talloc_free(pd);
return 0;
+
+fail:
+ talloc_free(pd);
+ exit(-1);
}