diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2022-10-01 19:16:16 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2022-10-01 19:16:16 -0700 |
| commit | 305a72efa791c826fe84768ca55e31adc4113ea8 (patch) | |
| tree | 35c72646ea4b81528d73d3d79650004abed3285b /ipc/namespace.c | |
| parent | nvdimm/namespace: drop unneeded temporary variable in size_store() (diff) | |
| parent | ACPI: HMAT: Release platform device in case of platform_device_add_data() fails (diff) | |
| download | wireguard-linux-305a72efa791c826fe84768ca55e31adc4113ea8.tar.xz wireguard-linux-305a72efa791c826fe84768ca55e31adc4113ea8.zip | |
Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next
Add v6.1 content on top of some straggling updates that missed v6.0.
Diffstat (limited to 'ipc/namespace.c')
| -rw-r--r-- | ipc/namespace.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ipc/namespace.c b/ipc/namespace.c index 754f3237194a..e1fcaedba4fa 100644 --- a/ipc/namespace.c +++ b/ipc/namespace.c @@ -64,7 +64,7 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns, goto fail_put; if (!setup_ipc_sysctls(ns)) - goto fail_put; + goto fail_mq; sem_init_ns(ns); msg_init_ns(ns); @@ -72,6 +72,9 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns, return ns; +fail_mq: + retire_mq_sysctls(ns); + fail_put: put_user_ns(ns->user_ns); ns_free_inum(&ns->ns); |