1 files changed, 7 insertions, 4 deletions

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 24b5c59b1c53..b61a770884fa 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -401,9 +401,9 @@ static int compute_score(struct sock *sk, struct net *net,
                 bool dev_match = (sk->sk_bound_dev_if == dif ||
                                   sk->sk_bound_dev_if == sdif);
 
-                if (exact_dif && !dev_match)
+                if (!dev_match)
                         return -1;
-                if (sk->sk_bound_dev_if && dev_match)
+                if (sk->sk_bound_dev_if)
                         score += 4;
         }
 
@@ -952,8 +952,10 @@ int udp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
         sock_tx_timestamp(sk, ipc.sockc.tsflags, &ipc.tx_flags);
 
         if (ipc.opt && ipc.opt->opt.srr) {
-                if (!daddr)
-                        return -EINVAL;
+                if (!daddr) {
+                        err = -EINVAL;
+                        goto out_free;
+                }
                 faddr = ipc.opt->opt.faddr;
                 connected = 0;
         }
@@ -1074,6 +1076,7 @@ do_append_data:
 
 out:
         ip_rt_put(rt);
+out_free:
         if (free)
                 kfree(ipc.opt);
         if (!err)