Browse code
Fix resolved DNS_TRANSACTION_PENDING assert issue.
Change-Id: I08f9692c3a6901a1013addb2631c79b1ec2d362e
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1298
Reviewed-by: suezzelur <anishs@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>
(cherry picked from commit 6ef6bc1949038e23b54d4502d8e35212540f4c31)
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1300
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
vinaykul authored on 2016/08/17 13:26:04Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,17 @@ |
| 0 |
+diff -uNr systemd-228/src/resolve/resolved-dns-transaction.c systemd-228-dnsfix/src/resolve/resolved-dns-transaction.c |
|
| 1 |
+--- systemd-228/src/resolve/resolved-dns-transaction.c 2016-08-17 02:58:53.854296643 +0000 |
|
| 2 |
+@@ -342,10 +342,12 @@ |
|
| 3 |
+ |
|
| 4 |
+ assert(t); |
|
| 5 |
+ assert(p); |
|
| 6 |
+- assert(t->state == DNS_TRANSACTION_PENDING); |
|
| 7 |
+ assert(t->scope); |
|
| 8 |
+ assert(t->scope->manager); |
|
| 9 |
+ |
|
| 10 |
++ if (t->state != DNS_TRANSACTION_PENDING) |
|
| 11 |
++ return; |
|
| 12 |
++ |
|
| 13 |
+ /* Note that this call might invalidate the query. Callers |
|
| 14 |
+ * should hence not attempt to access the query or transaction |
|
| 15 |
+ * after calling this function. */ |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Systemd-228 |
| 2 | 2 |
Name: systemd |
| 3 | 3 |
Version: 228 |
| 4 |
-Release: 27%{?dist}
|
|
| 4 |
+Release: 28%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ and GPLv2+ and MIT |
| 6 | 6 |
URL: http://www.freedesktop.org/wiki/Software/systemd/ |
| 7 | 7 |
Group: System Environment/Security |
| ... | ... |
@@ -30,6 +30,7 @@ Patch14: systemd-228-ipv6-disabled-fix.patch |
| 30 | 30 |
Patch15: systemd-228-default-dns-from-env.patch |
| 31 | 31 |
Patch16: systemd-228-dhcp-duid-api-update.patch |
| 32 | 32 |
Patch17: systemd-228-domains-search-fix.patch |
| 33 |
+Patch18: systemd-228-dns-transaction-pending-fix.patch |
|
| 33 | 34 |
Requires: Linux-PAM |
| 34 | 35 |
Requires: libcap |
| 35 | 36 |
Requires: xz |
| ... | ... |
@@ -80,6 +81,7 @@ sed -i "s:blkid/::" $(grep -rl "blkid/blkid.h") |
| 80 | 80 |
%patch15 -p1 |
| 81 | 81 |
%patch16 -p1 |
| 82 | 82 |
%patch17 -p1 |
| 83 |
+%patch18 -p1 |
|
| 83 | 84 |
sed -i "s#\#DefaultTasksMax=512#DefaultTasksMax=infinity#g" src/core/system.conf |
| 84 | 85 |
|
| 85 | 86 |
%build |
| ... | ... |
@@ -216,6 +218,8 @@ rm -rf %{buildroot}/*
|
| 216 | 216 |
%dir %{_localstatedir}/log/journal
|
| 217 | 217 |
|
| 218 | 218 |
%changelog |
| 219 |
+* Tue Aug 16 2016 Vinay Kulkarni <kulkarniv@vmware.com> 228-28 |
|
| 220 |
+- systemd-resolved: Fix DNS_TRANSACTION_PENDING assert. |
|
| 219 | 221 |
* Mon Aug 1 2016 Divya Thaluru <dthaluru@vmware.com> 228-27 |
| 220 | 222 |
- Removed packaging of symlinks and will be created during installation |
| 221 | 223 |
* Tue Jul 12 2016 Vinay Kulkarni <kulkarniv@vmware.com> 228-26 |