| Message ID | 20230725-send-net-20230725-v1-2-6f60fe7137a9@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 21d9b73a7d5241905367098d260a3c68b811da32 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | mptcp: More fixes for 6.5 | expand |
| Context | Check | Description |
|---|---|---|
| netdev/series_format | success | Posting correctly formatted |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/fixes_present | success | Fixes tag present in non-next series |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 1345 this patch: 1345 |
| netdev/cc_maintainers | success | CCed 9 of 9 maintainers |
| netdev/build_clang | success | Errors and warnings before: 1365 this patch: 1365 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/deprecated_api | success | None detected |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | Fixes tag looks correct |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 1368 this patch: 1368 |
| netdev/checkpatch | warning | WARNING: line length of 81 exceeds 80 columns |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
On Tue, Jul 25, 2023 at 11:34:56AM -0700, Mat Martineau wrote: > From: Paolo Abeni <pabeni@redhat.com> > > Currently the mptcp code generate a "new listener" event even > if the actual listen() syscall fails. Address the issue moving > the event generation call under the successful branch. > > Fixes: f8c9dfbd875b ("mptcp: add pm listener events") > Reviewed-by: Mat Martineau <martineau@kernel.org> > Signed-off-by: Paolo Abeni <pabeni@redhat.com> > Signed-off-by: Mat Martineau <martineau@kernel.org> > --- > net/mptcp/protocol.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c > index 3613489eb6e3..3317d1cca156 100644 > --- a/net/mptcp/protocol.c > +++ b/net/mptcp/protocol.c > @@ -3723,10 +3723,9 @@ static int mptcp_listen(struct socket *sock, int backlog) > if (!err) { > sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); > mptcp_copy_inaddrs(sk, ssock->sk); > + mptcp_event_pm_listener(ssock->sk, MPTCP_EVENT_LISTENER_CREATED); > } > > - mptcp_event_pm_listener(ssock->sk, MPTCP_EVENT_LISTENER_CREATED); > - > unlock: > release_sock(sk); > return err; > > -- > 2.41.0 > <formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read: https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html for how to do this properly. </formletter>
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3613489eb6e3..3317d1cca156 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3723,10 +3723,9 @@ static int mptcp_listen(struct socket *sock, int backlog) if (!err) { sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1); mptcp_copy_inaddrs(sk, ssock->sk); + mptcp_event_pm_listener(ssock->sk, MPTCP_EVENT_LISTENER_CREATED); } - mptcp_event_pm_listener(ssock->sk, MPTCP_EVENT_LISTENER_CREATED); - unlock: release_sock(sk); return err;