renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 02:34:01 +08:00
Code

pktgen: simplify error handling in pgctrl_write()

Browse Source 
The 'out' label is just a relict from previous times as pgctrl_write()
had multiple error paths. Get rid of it and simply return right away
on errors.

Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Mathias Krause <minipli@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Mathias Krause 2014-02-21 21:38:35 +01:00 committed by David S. Miller
parent 20b0c718c3
commit 0945574750
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/core/pktgen.c
View File

@ -476,14 +476,11 @@ static int pgctrl_show(struct seq_file *seq, void *v)
static ssize_t pgctrl_write(struct file *file, const char __user *buf, static ssize_t pgctrl_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
int err = 0;
char data[128]; char data[128];
struct pktgen_net *pn = net_generic(current->nsproxy->net_ns, pg_net_id); struct pktgen_net *pn = net_generic(current->nsproxy->net_ns, pg_net_id);
if (!capable(CAP_NET_ADMIN)) { if (!capable(CAP_NET_ADMIN))
err = -EPERM; return -EPERM;
goto out;
}
if (count == 0) if (count == 0)
return -EINVAL; return -EINVAL;
@ -491,10 +488,9 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf,
if (count > sizeof(data)) if (count > sizeof(data))
count = sizeof(data); count = sizeof(data);
if (copy_from_user(data, buf, count)) { if (copy_from_user(data, buf, count))
err = -EFAULT; return -EFAULT;
goto out;
}
data[count - 1] = 0; /* Strip trailing '\n' and terminate string */ data[count - 1] = 0; /* Strip trailing '\n' and terminate string */
if (!strcmp(data, "stop")) if (!strcmp(data, "stop"))
@ -509,10 +505,7 @@ static ssize_t pgctrl_write(struct file *file, const char __user *buf,
else else
pr_warning("Unknown command: %s\n", data); pr_warning("Unknown command: %s\n", data);
err = count; return count;
out:
return err;
} }
static int pgctrl_open(struct inode *inode, struct file *file) static int pgctrl_open(struct inode *inode, struct file *file)