Skip to content

Commit

Permalink
sock: unlock on error in sock_setsockopt()
Browse files Browse the repository at this point in the history
If copy_from_sockptr() then we need to unlock before returning.

Fixes: d463126 ("net: sock: extend SO_TIMESTAMPING for PHC binding")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Dan Carpenter authored and David S. Miller committed Jul 8, 2021
1 parent d7fba8f commit 271dbc3
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions net/core/sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -1123,8 +1123,10 @@ int sock_setsockopt(struct socket *sock, int level, int optname,
case SO_TIMESTAMPING_OLD:
if (optlen == sizeof(timestamping)) {
if (copy_from_sockptr(&timestamping, optval,
sizeof(timestamping)))
return -EFAULT;
sizeof(timestamping))) {
ret = -EFAULT;
break;
}
} else {
memset(&timestamping, 0, sizeof(timestamping));
timestamping.flags = val;
Expand Down

0 comments on commit 271dbc3

Please sign in to comment.