diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2020-01-17 08:59:29 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2020-01-17 08:59:29 +0100 |
commit | 6a77de2596a8d02cbfe9cebe448d8575e4354c9a (patch) | |
tree | 13e7621c147ef1415195213089ce3c2c94590bde /net/can/j1939/socket.c | |
parent | 59c324683400b41caa6d85b091e812ee3d5415c3 (diff) | |
parent | b3a987b0264d3ddbb24293ebff10eddfc472f653 (diff) | |
download | linux-6a77de2596a8d02cbfe9cebe448d8575e4354c9a.tar.bz2 |
Merge tag 'v5.5-rc6' into devel
Linux 5.5-rc6
Diffstat (limited to 'net/can/j1939/socket.c')
-rw-r--r-- | net/can/j1939/socket.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index de09b0a65791..f7587428febd 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c @@ -423,9 +423,9 @@ static int j1939_sk_bind(struct socket *sock, struct sockaddr *uaddr, int len) { struct sockaddr_can *addr = (struct sockaddr_can *)uaddr; struct j1939_sock *jsk = j1939_sk(sock->sk); - struct j1939_priv *priv = jsk->priv; - struct sock *sk = sock->sk; - struct net *net = sock_net(sk); + struct j1939_priv *priv; + struct sock *sk; + struct net *net; int ret = 0; ret = j1939_sk_sanity_check(addr, len); @@ -434,6 +434,10 @@ static int j1939_sk_bind(struct socket *sock, struct sockaddr *uaddr, int len) lock_sock(sock->sk); + priv = jsk->priv; + sk = sock->sk; + net = sock_net(sk); + /* Already bound to an interface? */ if (jsk->state & J1939_SOCK_BOUND) { /* A re-bind() to a different interface is not |