From 5f674ca5172001aff4b90f0f758e0767894ab29a Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 17 Apr 2009 11:40:17 +0200 Subject: [PATCH] s3:registry: Prevent creation of keys containing the '/' character. This creates a broken registry that can only be fixed with tdbtool, since the '/' sign is used as a key separator after normalization at a lower level. This makes e.g. "net conf setparm abc/def comment xyz" fail with WERR_INVALID_PARAM, which is much more desirable than a broken registry.tdb. Michael (cherry picked from commit 943b33587c9905e0b6b6ee090fe9bf9bdfc77465) --- source/registry/reg_api.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/registry/reg_api.c b/source/registry/reg_api.c index c49ee03fab7..0f12c786c3e 100644 --- a/source/registry/reg_api.c +++ b/source/registry/reg_api.c @@ -459,6 +459,16 @@ WERROR reg_createkey(TALLOC_CTX *ctx, struct registry_key *parent, char *path, *end; WERROR err; + /* + * We must refuse to handle subkey-paths containing + * a '/' character because at a lower level, after + * normalization, '/' is treated as a key separator + * just like '\\'. + */ + if (strchr(subkeypath, '/') != NULL) { + return WERR_INVALID_PARAM; + } + if (!(mem_ctx = talloc_new(ctx))) return WERR_NOMEM; if (!(path = talloc_strdup(mem_ctx, subkeypath))) { -- 2.11.4.GIT