From: Christoph Hellwig <hch@lst.de>
To: Ido Schimmel <idosch@idosch.org>
Cc: Christoph Hellwig <hch@lst.de>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3] net/scm: cleanup scm_detach_fds
Date: Wed, 13 May 2020 12:17:51 +0200 [thread overview]
Message-ID: <20200513101751.GA1454@lst.de> (raw)
In-Reply-To: <20200513101037.GA1143@lst.de>
On Wed, May 13, 2020 at 12:10:37PM +0200, Christoph Hellwig wrote:
> Ok. I'll see what went wrong for real and will hopefully have a
> different patch for you in a bit.
Can you try this patch instead of the previous one?
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)
next prev parent reply other threads:[~2020-05-13 10:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 11:59 improve msg_control kernel vs user pointer handling Christoph Hellwig
2020-05-11 11:59 ` [PATCH 1/3] net: add a CMSG_USER_DATA macro Christoph Hellwig
2020-05-12 8:28 ` Sergei Shtylyov
2020-05-13 6:03 ` Christoph Hellwig
2020-05-11 11:59 ` [PATCH 2/3] net/scm: cleanup scm_detach_fds Christoph Hellwig
2020-05-13 9:29 ` Ido Schimmel
2020-05-13 9:49 ` Christoph Hellwig
2020-05-13 9:58 ` Ido Schimmel
2020-05-13 10:10 ` Christoph Hellwig
2020-05-13 10:17 ` Christoph Hellwig [this message]
2020-05-13 10:31 ` Ido Schimmel
2020-05-11 11:59 ` [PATCH 3/3] net: cleanly handle kernel vs user buffers for ->msg_control Christoph Hellwig
2020-05-13 15:41 ` Eric Dumazet
2020-05-13 16:09 ` Christoph Hellwig
2020-05-13 16:18 ` Eric Dumazet
2020-05-13 16:58 ` Christoph Hellwig
2020-05-12 0:00 ` improve msg_control kernel vs user pointer handling David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200513101751.GA1454@lst.de \
--to=hch@lst.de \
--cc=davem@davemloft.net \
--cc=idosch@idosch.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).