metadata: simplify OOM check for cmdline
authorDaniel Mack <daniel@zonque.org>
Thu, 8 Jan 2015 16:34:39 +0000 (17:34 +0100)
committerDaniel Mack <daniel@zonque.org>
Thu, 8 Jan 2015 16:34:39 +0000 (17:34 +0100)
Signed-off-by: Daniel Mack <daniel@zonque.org>
metadata.c

index 6f2b84444aacc34ce401f6c20a6f1341fff3a9c9..492cc42dc8f0a1469979929a9d6a78b87a990836 100644 (file)
@@ -404,12 +404,10 @@ int kdbus_meta_add_current(struct kdbus_meta *meta, u64 which)
 
                        s = (const char __user *)mm->arg_start;
                        meta->cmdline = strndup_user(s, len);
-                       if (!meta->cmdline) {
-                               mmput(mm);
-                               return -ENOMEM;
-                       }
-
                        mmput(mm);
+
+                       if (!meta->cmdline)
+                               return -ENOMEM;
                }
 
                meta->collected |= KDBUS_ATTACH_CMDLINE;