From 0eb5e6d3f08c6b3a41cfa7ac02bcc6302259ed4a Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 18 Sep 2019 22:14:45 +0900
Subject: [PATCH] dhcp6: use unaligned_read_be32()

Closes #13591.
---
 src/libsystemd-network/sd-dhcp6-client.c |   2 +-
 test/fuzz/fuzz-dhcp6-client/crash-13591  | Bin 0 -> 12069 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 test/fuzz/fuzz-dhcp6-client/crash-13591

diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 5a3b0a6353..9773a067d5 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -1005,7 +1005,7 @@ static int client_parse_message(
                         if (optlen != 4)
                                 return -EINVAL;
 
-                        irt = be32toh(*(be32_t *) optval) * USEC_PER_SEC;
+                        irt = unaligned_read_be32((be32_t *) optval) * USEC_PER_SEC;
                         break;
                 }
 
diff --git a/test/fuzz/fuzz-dhcp6-client/crash-13591 b/test/fuzz/fuzz-dhcp6-client/crash-13591
new file mode 100644
index 0000000000000000000000000000000000000000..20ac358f4d4a2b030c5521a1b84f71fd8ecb5309
GIT binary patch
literal 12069
zcmeHN!D<vi5UrSKh<Fe@g`fny2p*#1B?rOFMp5HI!H|F_LGWTgy$O<U@C$O-gF_HO
zP?G`Id%nXj@MI8ntm>ZbuI}lc?U|j~-6T6`GMQ|udtO()dR5(L;1a+rY;FEtdH{I+
zJwJc+lWxw!T0hIKCU|v|l&-rS{Bl1{d+B};l8k<X7k+dv`IICXEW;eoKS&PxuMZE&
zh`0jQ-BEUZqa4XW<S2MgqnJ68`AF;f9rm4fKofg3h?;-Y-23?U+M+<EpL)US!EO!|
zLuO^?<7Jw9Xzo7TJ<rI(;^X(X=)1f^bAR{*zUftM1$W^uu4Nk`pWpa!pP_fLR`uvy
zx#a-%_J9n30Tvsf%({hp!SBudhxE!~WPMJ+Sf2~6tcitiyymZfZ!KK^IS*e7*Fd~p
z6fgm3bmlXBavT58!i7!r_OA5!ZlVL1{z9+_EYK~GYto0s5BV2{JLeibiZ_g`rL^KT
zfcq8p9FeJDJ!dq5JygbBainq^PMc^FFN8t!jafYcrz$dv$t)(u5!zw0@9i_$&D=%s
zTgcy!Ig<^_t;A$bVzFF5X@bRcCMRQp05tA3GB^D#Mwnk0FmJ?<)v%5Rn$ZO`#~=%+
zNGjp?SSFYpT`-L%R~N*n(r9Hj<wMOQHbq$(ju=LBc~RL-`EXoy(v%N%(lfg26sQZg
zptp+oD(d1IN?XYQ%H&$7)A{wIbH_4iu|d4v{g=gb9~!NZR#0msU3@2$GQ-tKtLR##
zH4;GHZNU$=RwJ!HQ<VU#g~;iZzn`WWNh-UIEm~uQKv!Utp9XfSqBVil?fH=F-SKvN
z{?LlE-asR2y47w^j3!W&qbR7*mXz4jYUkB(AO;Yenq7!SxktXw(A+Z*5Xn6Y<Q8?g
z=L^DG(%ZA5i{VQnP9FE<EpEjAdUf6xktO<Kt2@!0ABlb5e=Dn7rNi)id%UnWTM87Z
zHZz;J<bH$qQSo{rEBaukzYao0-<d>4!#5*F3wE20l8THflU<x{P?}2hr#iUpM%5B;
z!ZSs}s%2VK&6jw~{a&?~k%iTK)gxS2^{CfoRJrkLRr=*~ce97=)2J74GK+pJ9X3{(
zZ;2_myBCqFd{|#PIoYwMFCqA4d27t<+_*CTO8c;)->URYAzuAHk3nR+d%G2cnWu~n
z-I)_Vnz>tjkdt3Q6srf?6=Ay-1{t#(>e;8%RHZjWshMEyvTQtkWLYNQnRU+bPJYsk
zGH9oTWr`ZsJ!d>7R2K}~iEd6CXzV@cOtRv}l&J|^J7={#s!jp0N=LYC$q9hUxKAsc
zT$R>|*M@T`n$tex?w{ql(#lba&6@3UvAs*9d+VShot<m>31zd@vNJW6BPv+sjF`#R
z@3|)hQSsn0BC{t*iyF#+nzF`M<&5TR&1fSkO7*$wW3+wa^;a+6Y`@)p`3{}K>ecJH
z*V{`D^^HZLTxIu*DLm$-j5{sWC!Cz=$r7J;aaZNRRQ2^`pH<L>P#=`18qR*SfJ!mN
zWxs=jPL&k1pJ8C1e|VmePb{)d(6VsHQ<D8|m{nz`N>OhRDs5#yYhMh{u%u}}n}v-%
Otk58v0Xg;}jsG993Dt}M

literal 0
HcmV?d00001