Hello community, here is the log from the commit of package krb5 for openSUSE:Factory checked in at 2020-04-04 12:04:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krb5 (Old) and /work/SRC/openSUSE:Factory/.krb5.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krb5" Sat Apr 4 12:04:03 2020 rev:144 rq:789700 version:1.18 Changes: -------- --- /work/SRC/openSUSE:Factory/krb5/krb5-mini.changes 2020-02-28 15:19:02.473612162 +0100 +++ /work/SRC/openSUSE:Factory/.krb5.new.3248/krb5-mini.changes 2020-04-04 12:04:13.018565513 +0200 @@ -1,0 +2,7 @@ +Wed Mar 25 09:20:38 UTC 2020 - Samuel Cabrero <[email protected]> + +- Fix segfault in k5_primary_domain; (bsc#1167620); +- Added patches: + * 0009-Fix-null-dereference-qualifying-short-hostnames.patch + +------------------------------------------------------------------- krb5.changes: same change New: ---- 0009-Fix-null-dereference-qualifying-short-hostnames.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krb5-mini.spec ++++++ --- /var/tmp/diff_new_pack.cTGCyz/_old 2020-04-04 12:04:18.982571793 +0200 +++ /var/tmp/diff_new_pack.cTGCyz/_new 2020-04-04 12:04:18.982571793 +0200 @@ -44,6 +44,7 @@ Patch6: 0006-krb5-1.12-api.patch Patch7: 0007-SELinux-integration.patch Patch8: 0008-krb5-1.9-debuginfo.patch +Patch9: 0009-Fix-null-dereference-qualifying-short-hostnames.patch BuildRequires: autoconf BuildRequires: bison BuildRequires: keyutils ++++++ krb5.spec ++++++ --- /var/tmp/diff_new_pack.cTGCyz/_old 2020-04-04 12:04:19.006571818 +0200 +++ /var/tmp/diff_new_pack.cTGCyz/_new 2020-04-04 12:04:19.006571818 +0200 @@ -42,6 +42,7 @@ Patch6: 0006-krb5-1.12-api.patch Patch7: 0007-SELinux-integration.patch Patch8: 0008-krb5-1.9-debuginfo.patch +Patch9: 0009-Fix-null-dereference-qualifying-short-hostnames.patch BuildRequires: autoconf BuildRequires: bison BuildRequires: keyutils @@ -154,14 +155,7 @@ %prep %setup -q -n %{srcRoot} %setup -q -a 3 -T -D -n %{srcRoot} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%autopatch -p1 %build # needs to be re-generated ++++++ 0009-Fix-null-dereference-qualifying-short-hostnames.patch ++++++ >From 96d0ee0760a1c7cf735d04fbddf095a4c01ef190 Mon Sep 17 00:00:00 2001 From: Greg Hudson <[email protected]> Date: Tue, 3 Mar 2020 12:27:02 -0500 Subject: [PATCH] Fix null dereference qualifying short hostnames Fix the dnsglue.c PRIMARY_DOMAIN macro not to call strdup() with a null pointer if no DNS search path is configured. ticket: 8881 tags: pullup target_version: 1.18-next (cherry picked from commit cd82bf377e7fad2409c76bf8b241920692f34fda) --- src/lib/krb5/os/dnsglue.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/krb5/os/dnsglue.c b/src/lib/krb5/os/dnsglue.c index e35ca9d76..0cd213fdd 100644 --- a/src/lib/krb5/os/dnsglue.c +++ b/src/lib/krb5/os/dnsglue.c @@ -91,7 +91,7 @@ static int initparse(struct krb5int_dns_state *); #define DECLARE_HANDLE(h) struct __res_state h #define INIT_HANDLE(h) (memset(&h, 0, sizeof(h)), res_ninit(&h) == 0) #define SEARCH(h, n, c, t, a, l) res_nsearch(&h, n, c, t, a, l) -#define PRIMARY_DOMAIN(h) strdup(h.dnsrch[0]) +#define PRIMARY_DOMAIN(h) ((h.dnsrch[0] == NULL) ? NULL : strdup(h.dnsrch[0])) #if HAVE_RES_NDESTROY #define DESTROY_HANDLE(h) res_ndestroy(&h) #else @@ -104,7 +104,8 @@ static int initparse(struct krb5int_dns_state *); #define DECLARE_HANDLE(h) #define INIT_HANDLE(h) (res_init() == 0) #define SEARCH(h, n, c, t, a, l) res_search(n, c, t, a, l) -#define PRIMARY_DOMAIN(h) strdup(_res.defdname) +#define PRIMARY_DOMAIN(h) \ + ((_res.defdname == NULL) ? NULL : strdup(_res.defdname)) #define DESTROY_HANDLE(h) #endif -- 2.25.1
