1 files changed, 17 insertions, 15 deletions

diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index fdac61cac1bd..d0dac57291af 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -476,23 +476,22 @@ static int pgctrl_show(struct seq_file *seq, void *v)
 static ssize_t pgctrl_write(struct file *file, const char __user *buf,
                             size_t count, loff_t *ppos)
 {
-        int err = 0;
         char data[128];
         struct pktgen_net *pn = net_generic(current->nsproxy->net_ns, pg_net_id);
 
-        if (!capable(CAP_NET_ADMIN)) {
-                err = -EPERM;
-                goto out;
-        }
+        if (!capable(CAP_NET_ADMIN))
+                return -EPERM;
+
+        if (count == 0)
+                return -EINVAL;
 
         if (count > sizeof(data))
                 count = sizeof(data);
 
-        if (copy_from_user(data, buf, count)) {
-                err = -EFAULT;
-                goto out;
-        }
-        data[count - 1] = 0;    /* Make string */
+        if (copy_from_user(data, buf, count))
+                return -EFAULT;
+
+        data[count - 1] = 0;    /* Strip trailing '\n' and terminate string */
 
         if (!strcmp(data, "stop"))
                 pktgen_stop_all_threads_ifs(pn);
@@ -506,10 +505,7 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf,
         else
                 pr_warning("Unknown command: %s\n", data);
 
-        err = count;
-
-out:
-        return err;
+        return count;
 }
 
 static int pgctrl_open(struct inode *inode, struct file *file)
@@ -1251,7 +1247,13 @@ static ssize_t pktgen_if_write(struct file *file,
                                 "Flag -:%s:- unknown\nAvailable flags, (prepend ! to un-set flag):\n%s",
                                 f,
                                 "IPSRC_RND, IPDST_RND, UDPSRC_RND, UDPDST_RND, "
-                                "MACSRC_RND, MACDST_RND, TXSIZE_RND, IPV6, MPLS_RND, VID_RND, SVID_RND, FLOW_SEQ, IPSEC, NODE_ALLOC\n");
+                                "MACSRC_RND, MACDST_RND, TXSIZE_RND, IPV6, "
+                                "MPLS_RND, VID_RND, SVID_RND, FLOW_SEQ, "
+                                "QUEUE_MAP_RND, QUEUE_MAP_CPU, UDPCSUM, "
+#ifdef CONFIG_XFRM
+                                "IPSEC, "
+#endif
+                                "NODE_ALLOC\n");
                         return count;
                 }
                 sprintf(pg_result, "OK: flags=0x%x", pkt_dev->flags);