diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-21 08:27:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-05-21 08:27:15 +0200 |
| commit | c049ffb35ac4a393919a001f8f468c43cb185a34 (patch) | |
| tree | 3d8835848724bebf6326aaed3ae5e4dd8d302057 /net/ipv4/ping.c | |
| parent | baf12d6ddeae74dfcfd5d19fce86260a2e1e44f2 (diff) | |
| parent | 771c577c23bac90597c685971d7297ea00f99d11 (diff) | |
| download | op-kernel-dev-c049ffb35ac4a393919a001f8f468c43cb185a34.zip op-kernel-dev-c049ffb35ac4a393919a001f8f468c43cb185a34.tar.gz | |
Merge 4.17-rc6 into usb-next
We want the bug fixes and this resolves the merge issues with the usbip
driver.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv4/ping.c')
| -rw-r--r-- | net/ipv4/ping.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 05e47d7..56a0106 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -775,8 +775,10 @@ static int ping_v4_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) ipc.addr = faddr = daddr; if (ipc.opt && ipc.opt->opt.srr) { - if (!daddr) - return -EINVAL; + if (!daddr) { + err = -EINVAL; + goto out_free; + } faddr = ipc.opt->opt.faddr; } tos = get_rttos(&ipc, inet); @@ -842,6 +844,7 @@ back_from_confirm: out: ip_rt_put(rt); +out_free: if (free) kfree(ipc.opt); if (!err) { |
