diff options
| author | Mark Brown <broonie@kernel.org> | 2024-11-14 15:36:46 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-11-14 15:36:46 +0000 |
| commit | 9a5a75bf1f485e2d109303a996d147b94c5e79c9 (patch) | |
| tree | f931f0d17bef0b6ad980aaf3d2d8b874ef2b749c /net/socket.c | |
| parent | f3f9f0de30a5106078cd610f80eaa6f9386b2186 (diff) | |
| parent | 3b7e11a0116c30848d44429650ad80f9cc3bd963 (diff) | |
ASoc: simple-mux: Allow to specify an idle-state
Merge series from "Hendrik v. Raven" <h.v.raven@merzmedtech.de>:
This series adds support for the idle-state property from the mux
framework to the simple-mux audio variant. It allows to specify the state
of the mux when it is not in use.
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 601ad74930ef..042451f01c65 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1574,8 +1574,13 @@ int __sock_create(struct net *net, int family, int type, int protocol, rcu_read_unlock(); err = pf->create(net, sock, protocol, kern); - if (err < 0) + if (err < 0) { + /* ->create should release the allocated sock->sk object on error + * but it may leave the dangling pointer + */ + sock->sk = NULL; goto out_module_put; + } /* * Now to bump the refcnt of the [loadable] module that owns this |