[PATCH] net: ignore sock_from_file errors in __scm_install_fd

[PATCH] net: ignore sock_from_file errors in __scm_install_fd

[Christoph Hellwig]

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")
Reported-by: Ido Schimmel <idosch@idosch.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 net/core/scm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/scm.c b/net/core/scm.c
index a75cd637a71ff..875df1c2989db 100644
--- a/net/core/scm.c
+++ b/net/core/scm.c
@@ -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)
-- 
2.26.2

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

[Ido Schimmel]

On Wed, May 13, 2020 at 01:07:59PM +0200, Christoph Hellwig wrote:
> 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")
> Reported-by: Ido Schimmel <idosch@idosch.org>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Tested-by: Ido Schimmel <idosch@mellanox.com>

Thanks, Christoph.

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

[Ioana Ciornei]

> 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")
> Reported-by: Ido Schimmel <idosch@idosch.org>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Tested-by: Ioana Ciornei <ioana.ciornei@nxp.com>

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

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

[David Miller]

From: Christoph Hellwig <hch@lst.de>
Date: Wed, 13 May 2020 13:07:59 +0200

> 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")
> Reported-by: Ido Schimmel <idosch@idosch.org>
> Signed-off-by: Christoph Hellwig <hch@lst.de>

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

Thank you.