Skip to contentSkip to conversation

net: ignore sock_from_file errors in __scm_install_fd

PATCH Applied Christoph Hellwig 4 participants 4 messages May 13, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: ignore sock_from_file errors in __scm_install_fd

The code had historically been ignoring these errors, and my recent refactoring changed that, which broke ssh in some setups.

Fixes 2618d530dd8b ("net/scm: cleanup scm_detach_fds")
---
 net/core/scm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/scm.c +1 -1
index a75cd637a71ff..875df1c2989db 100644
@@ -307,7 +307,7 @@ static int __scm_install_fd(struct file *file, int __user *ufd, int o_flags)
 		sock_update_classid(&sock->sk->sk_cgrp_data);
 	}
 	fd_install(new_fd, get_file(file));
-	return error;
+	return 0;
 }
 
 static int scm_max_fds(struct msghdr *msg)
Signature · 1 line
2.26.2
Tested-by on v1 1/1
#2 lore raw
In reply to Christoph Hellwig
Quoted 8 lines

Subject: [PATCH] net: ignore sock_from_file errors in __scm_install_fd

The code had historically been ignoring these errors, and my recent refactoring changed that, which broke ssh in some setups.

Fixes 2618d530dd8b ("net/scm: cleanup scm_detach_fds")

Thanks, I was wondering why my ssh was not working anymore.

maintainer Applied
#3 lore raw
In reply to Christoph Hellwig

From: Christoph Hellwig <[email protected]>
Date: Wed, 13 May 2020 13:07:59 +0200

Quoted 6 lines

The code had historically been ignoring these errors, and my recent refactoring changed that, which broke ssh in some setups.

Fixes 2618d530dd8b ("net/scm: cleanup scm_detach_fds")

Applied, please put something like "[PATCH net-next]" in the Subject line next time.

Thank you.