From: Chris Clark Date: Tue, 27 Aug 2013 18:02:15 +0000 (-0600) Subject: ipv4: sendto/hdrincl: don't use destination address found in header X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=322f496d0fa2ea9cb0afb1a35c84d0292fd64894;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git ipv4: sendto/hdrincl: don't use destination address found in header ipv4: raw_sendmsg: don't use header's destination address A sendto() regression was bisected and found to start with commit f8126f1d5136be1 (ipv4: Adjust semantics of rt->rt_gateway.) The problem is that it tries to ARP-lookup the constructed packet's destination address rather than the explicitly provided address. Fix this using FLOWI_FLAG_KNOWN_NH so that given nexthop is used. cf. commit 2ad5b9e4bd314fc685086b99e90e5de3bc59e26b Reported-by: Chris Clark Bisected-by: Chris Clark Tested-by: Chris Clark Suggested-by: Julian Anastasov Signed-off-by: Chris Clark Change-Id: I06c9f3a0bca97a4b190e31543345e5accbf73a6d --- diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 14aa2ceabab..a2e361c956b 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -574,7 +574,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos, RT_SCOPE_UNIVERSE, inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol, - inet_sk_flowi_flags(sk) | FLOWI_FLAG_CAN_SLEEP, + inet_sk_flowi_flags(sk) | FLOWI_FLAG_CAN_SLEEP | + (inet->hdrincl ? FLOWI_FLAG_KNOWN_NH : 0), daddr, saddr, 0, 0); if (!inet->hdrincl) {