From 0d4fc19ac764bc1b5b316867b50f7bc33cef9f9b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 28 Nov 2011 10:44:42 +0100 Subject: [PATCH] s3: Fix a crash in group_mapping.ldb->tdb conversion When we find a group_mapping.ldb entry without a comment, the upgrade code would have crashed with a NULL dereference Autobuild-User: Volker Lendecke Autobuild-Date: Mon Nov 28 12:24:08 CET 2011 on sn-devel-104 --- source3/groupdb/mapping_tdb.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c index 394a2f0b223..1dea9e482e5 100644 --- a/source3/groupdb/mapping_tdb.c +++ b/source3/groupdb/mapping_tdb.c @@ -1006,6 +1006,19 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key, TALLOC_FREE(name); } + if (map->nt_name == NULL) { + errno = EIO; + goto failed; + } + + if (map->comment == NULL) { + map->comment = talloc_strdup(map, ""); + } + if (map->comment == NULL) { + errno = ENOMEM; + goto failed; + } + if (!add_mapping_entry(map, 0)) { errno = EIO; goto failed; -- 2.34.1