git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/notify
[pandora-kernel.git]
/
net
/
core
/
pktgen.c
diff --git
a/net/core/pktgen.c
b/net/core/pktgen.c
index
2c0df0f
..
fbce4b0
100644
(file)
--- a/
net/core/pktgen.c
+++ b/
net/core/pktgen.c
@@
-771,10
+771,10
@@
done:
static unsigned long num_arg(const char __user * user_buffer,
unsigned long maxlen, unsigned long *num)
{
static unsigned long num_arg(const char __user * user_buffer,
unsigned long maxlen, unsigned long *num)
{
- int i
= 0
;
+ int i;
*num = 0;
*num = 0;
- for (; i < maxlen; i++) {
+ for (
i = 0
; i < maxlen; i++) {
char c;
if (get_user(c, &user_buffer[i]))
return -EFAULT;
char c;
if (get_user(c, &user_buffer[i]))
return -EFAULT;
@@
-789,9
+789,9
@@
static unsigned long num_arg(const char __user * user_buffer,
static int strn_len(const char __user * user_buffer, unsigned int maxlen)
{
static int strn_len(const char __user * user_buffer, unsigned int maxlen)
{
- int i
= 0
;
+ int i;
- for (; i < maxlen; i++) {
+ for (
i = 0
; i < maxlen; i++) {
char c;
if (get_user(c, &user_buffer[i]))
return -EFAULT;
char c;
if (get_user(c, &user_buffer[i]))
return -EFAULT;
@@
-846,7
+846,7
@@
static ssize_t pktgen_if_write(struct file *file,
{
struct seq_file *seq = file->private_data;
struct pktgen_dev *pkt_dev = seq->private;
{
struct seq_file *seq = file->private_data;
struct pktgen_dev *pkt_dev = seq->private;
- int i
= 0
, max, len;
+ int i, max, len;
char name[16], valstr[32];
unsigned long value = 0;
char *pg_result = NULL;
char name[16], valstr[32];
unsigned long value = 0;
char *pg_result = NULL;
@@
-860,13
+860,13
@@
static ssize_t pktgen_if_write(struct file *file,
return -EINVAL;
}
return -EINVAL;
}
- max = count
- i
;
- tmp = count_trail_chars(
&user_buffer[i]
, max);
+ max = count;
+ tmp = count_trail_chars(
user_buffer
, max);
if (tmp < 0) {
pr_warning("illegal format\n");
return tmp;
}
if (tmp < 0) {
pr_warning("illegal format\n");
return tmp;
}
- i
+
= tmp;
+ i = tmp;
/* Read variable name */
/* Read variable name */
@@
-887,10
+887,11
@@
static ssize_t pktgen_if_write(struct file *file,
i += len;
if (debug) {
i += len;
if (debug) {
- char tb[count + 1];
- if (copy_from_user(tb, user_buffer, count))
+ size_t copy = min(count, 1023);
+ char tb[copy + 1];
+ if (copy_from_user(tb, user_buffer, copy))
return -EFAULT;
return -EFAULT;
- tb[co
unt
] = 0;
+ tb[co
py
] = 0;
printk(KERN_DEBUG "pktgen: %s,%lu buffer -:%s:-\n", name,
(unsigned long)count, tb);
}
printk(KERN_DEBUG "pktgen: %s,%lu buffer -:%s:-\n", name,
(unsigned long)count, tb);
}
@@
-1764,7
+1765,7
@@
static ssize_t pktgen_thread_write(struct file *file,
{
struct seq_file *seq = file->private_data;
struct pktgen_thread *t = seq->private;
{
struct seq_file *seq = file->private_data;
struct pktgen_thread *t = seq->private;
- int i
= 0
, max, len, ret;
+ int i, max, len, ret;
char name[40];
char *pg_result;
char name[40];
char *pg_result;
@@
-1773,12
+1774,12
@@
static ssize_t pktgen_thread_write(struct file *file,
return -EINVAL;
}
return -EINVAL;
}
- max = count
- i
;
- len = count_trail_chars(
&user_buffer[i]
, max);
+ max = count;
+ len = count_trail_chars(
user_buffer
, max);
if (len < 0)
return len;
if (len < 0)
return len;
- i
+
= len;
+ i = len;
/* Read variable name */
/* Read variable name */
@@
-1975,7
+1976,7
@@
static struct net_device *pktgen_dev_get_by_name(struct pktgen_dev *pkt_dev,
const char *ifname)
{
char b[IFNAMSIZ+5];
const char *ifname)
{
char b[IFNAMSIZ+5];
- int i
= 0
;
+ int i;
for (i = 0; ifname[i] != '@'; i++) {
if (i == IFNAMSIZ)
for (i = 0; ifname[i] != '@'; i++) {
if (i == IFNAMSIZ)
@@
-2519,8
+2520,8
@@
static void free_SAs(struct pktgen_dev *pkt_dev)
{
if (pkt_dev->cflows) {
/* let go of the SAs if we have them */
{
if (pkt_dev->cflows) {
/* let go of the SAs if we have them */
- int i
= 0
;
- for (
;
i < pkt_dev->cflows; i++) {
+ int i;
+ for (
i = 0;
i < pkt_dev->cflows; i++) {
struct xfrm_state *x = pkt_dev->flows[i].x;
if (x) {
xfrm_state_put(x);
struct xfrm_state *x = pkt_dev->flows[i].x;
if (x) {
xfrm_state_put(x);