Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4e71e474c784dc274f28ec8bb22a5dbabc6dc7c5

Authored by Cedric Le Goater
Committed by Linus Torvalds
1 parent 6d79af701d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

fix refcounting of nsproxy object when unshared 

When a namespace is unshared, a refcount on the previous nsproxy is
abusively taken, leading to a memory leak of nsproxy objects.

Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Cc: Badari Pulavarty <pbadari@us.ibm.com>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 8 deletions Side-by-side Diff

... ... @@ -145,13 +145,11 @@
145 145  
146 146 /*
147 147 * Called from unshare. Unshare all the namespaces part of nsproxy.
148   - * On sucess, returns the new nsproxy and a reference to old nsproxy
149   - * to make sure it stays around.
  148 + * On success, returns the new nsproxy.
150 149 */
151 150 int unshare_nsproxy_namespaces(unsigned long unshare_flags,
152 151 struct nsproxy **new_nsp, struct fs_struct *new_fs)
153 152 {
154   - struct nsproxy *old_ns = current->nsproxy;
155 153 int err = 0;
156 154  
157 155 if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC)))
158 156  
159 157  
... ... @@ -170,14 +168,10 @@
170 168 if (!capable(CAP_SYS_ADMIN))
171 169 return -EPERM;
172 170  
173   - get_nsproxy(old_ns);
174   -
175 171 *new_nsp = create_new_namespaces(unshare_flags, current,
176 172 new_fs ? new_fs : current->fs);
177   - if (IS_ERR(*new_nsp)) {
  173 + if (IS_ERR(*new_nsp))
178 174 err = PTR_ERR(*new_nsp);
179   - put_nsproxy(old_ns);
180   - }
181 175 return err;
182 176 }