diff options
| author | Pavel Březina <pbrezina@redhat.com> | 2012-03-09 14:01:16 +0100 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-03-09 14:17:08 -0500 |
| commit | c685beb31f9755677ef8966b39c558f719bf4cf5 (patch) | |
| tree | f3a2aabb4b0cdd0302d9db0c16b705fc3c39b319 | |
| parent | c91cb8bbff3d06597bdda7715a65698d7b556bc8 (diff) | |
| download | sssd-c685beb31f9755677ef8966b39c558f719bf4cf5.tar.gz sssd-c685beb31f9755677ef8966b39c558f719bf4cf5.tar.xz sssd-c685beb31f9755677ef8966b39c558f719bf4cf5.zip | |
Potential NULL-dereference in sudosrv_cmd_get_sudorules
https://fedorahosted.org/sssd/ticket/1236
| -rw-r--r-- | src/responder/sudo/sudosrv_cmd.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/responder/sudo/sudosrv_cmd.c b/src/responder/sudo/sudosrv_cmd.c index 8920ca282..e3dd38422 100644 --- a/src/responder/sudo/sudosrv_cmd.c +++ b/src/responder/sudo/sudosrv_cmd.c @@ -164,8 +164,9 @@ static int sudosrv_cmd_get_sudorules(struct cli_ctx *cli_ctx) cmd_ctx = talloc_zero(cli_ctx, struct sudo_cmd_ctx); if (!cmd_ctx) { - ret = ENOMEM; - goto done; + /* kill the connection here as we have no context for reply */ + DEBUG(SSSDBG_FATAL_FAILURE, ("Out of memory?\n")); + return ENOMEM; } cmd_ctx->cli_ctx = cli_ctx; cmd_ctx->type = SSS_DP_SUDO_USER; @@ -173,16 +174,14 @@ static int sudosrv_cmd_get_sudorules(struct cli_ctx *cli_ctx) /* get responder ctx */ cmd_ctx->sudo_ctx = talloc_get_type(cli_ctx->rctx->pvt_ctx, struct sudo_ctx); if (!cmd_ctx->sudo_ctx) { - DEBUG(SSSDBG_FATAL_FAILURE, ("sudo_ctx not set\n")); - ret = EFAULT; - goto done; + DEBUG(SSSDBG_FATAL_FAILURE, ("sudo_ctx not set, killing connection!\n")); + return EFAULT; } /* create domain ctx */ dctx = talloc_zero(cmd_ctx, struct sudo_dom_ctx); if (!dctx) { - ret = ENOMEM; - goto done; + return sudosrv_cmd_send_error(cmd_ctx, cmd_ctx, ENOMEM); } dctx->cmd_ctx = cmd_ctx; dctx->orig_username = NULL; @@ -263,8 +262,9 @@ static int sudosrv_cmd_get_defaults(struct cli_ctx *cli_ctx) cmd_ctx = talloc_zero(cli_ctx, struct sudo_cmd_ctx); if (!cmd_ctx) { - ret = ENOMEM; - goto done; + /* kill the connection here as we have no context for reply */ + DEBUG(SSSDBG_FATAL_FAILURE, ("Out of memory?\n")); + return ENOMEM; } cmd_ctx->cli_ctx = cli_ctx; cmd_ctx->type = SSS_DP_SUDO_DEFAULTS; @@ -274,16 +274,14 @@ static int sudosrv_cmd_get_defaults(struct cli_ctx *cli_ctx) /* get responder ctx */ cmd_ctx->sudo_ctx = talloc_get_type(cli_ctx->rctx->pvt_ctx, struct sudo_ctx); if (!cmd_ctx->sudo_ctx) { - DEBUG(SSSDBG_FATAL_FAILURE, ("sudo_ctx not set\n")); - ret = EFAULT; - goto done; + DEBUG(SSSDBG_FATAL_FAILURE, ("sudo_ctx not set, killing connection!\n")); + return EFAULT; } /* create domain ctx */ dctx = talloc_zero(cmd_ctx, struct sudo_dom_ctx); if (!dctx) { - ret = ENOMEM; - goto done; + return sudosrv_cmd_send_error(cmd_ctx, cmd_ctx, ENOMEM); } dctx->cmd_ctx = cmd_ctx; dctx->orig_username = NULL; |