projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-print: Print NXST_FLOW_REQUEST and NXST_AGGREGATE_REQUEST.
[openvswitch]
/
datapath
/
brcompat.c
diff --git
a/datapath/brcompat.c
b/datapath/brcompat.c
index b68720bd811f3e031aab7237faeb83cd59bcc06b..2113eae0f7a39fed65128a8bb6fcf56fa1ab749d 100644
(file)
--- a/
datapath/brcompat.c
+++ b/
datapath/brcompat.c
@@
-6,6
+6,8
@@
* kernel, by Linus Torvalds and others.
*/
* kernel, by Linus Torvalds and others.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <asm/uaccess.h>
#include <linux/completion.h>
#include <linux/kernel.h>
#include <asm/uaccess.h>
#include <linux/completion.h>
@@
-82,6
+84,9
@@
static int brc_add_del_bridge(char __user *uname, int add)
struct sk_buff *request;
char name[IFNAMSIZ];
struct sk_buff *request;
char name[IFNAMSIZ];
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+
if (copy_from_user(name, uname, IFNAMSIZ))
return -EFAULT;
if (copy_from_user(name, uname, IFNAMSIZ))
return -EFAULT;
@@
-194,6
+199,9
@@
static int brc_add_del_port(struct net_device *dev, int port_ifindex, int add)
struct net_device *port;
int err;
struct net_device *port;
int err;
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+
port = __dev_get_by_index(&init_net, port_ifindex);
if (!port)
return -EINVAL;
port = __dev_get_by_index(&init_net, port_ifindex);
if (!port)
return -EINVAL;
@@
-252,7
+260,7
@@
static int brc_get_port_list(struct net_device *dev, int __user *uindices,
* (limited to a page for sanity)
* offset -- number of records to skip
*/
* (limited to a page for sanity)
* offset -- number of records to skip
*/
-static int brc_get_fdb_entries(struct net_device *dev, void __user *userbuf,
+static int brc_get_fdb_entries(struct net_device *dev, void __user *userbuf,
unsigned long maxnum, unsigned long offset)
{
struct nlattr *attrs[BRC_GENL_A_MAX + 1];
unsigned long maxnum, unsigned long offset)
{
struct nlattr *attrs[BRC_GENL_A_MAX + 1];
@@
-370,7
+378,7
@@
static int brc_genl_query(struct sk_buff *skb, struct genl_info *info)
void *data;
ans_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
void *data;
ans_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
- if (!ans_skb)
+ if (!ans_skb)
return -ENOMEM;
data = genlmsg_put_reply(ans_skb, info, &brc_genl_family,
return -ENOMEM;
data = genlmsg_put_reply(ans_skb, info, &brc_genl_family,
@@
-425,8
+433,7
@@
static int brc_genl_dp_result(struct sk_buff *skb, struct genl_info *info)
if (brc_seq == info->snd_seq) {
brc_seq++;
if (brc_seq == info->snd_seq) {
brc_seq++;
- if (brc_reply)
- kfree_skb(brc_reply);
+ kfree_skb(brc_reply);
brc_reply = skb;
complete(&brc_done);
brc_reply = skb;
complete(&brc_done);
@@
-482,7
+489,7
@@
static struct sk_buff *brc_send_command(struct sk_buff *request,
/* Wait for reply. */
error = -ETIMEDOUT;
if (!wait_for_completion_timeout(&brc_done, BRC_TIMEOUT)) {
/* Wait for reply. */
error = -ETIMEDOUT;
if (!wait_for_completion_timeout(&brc_done, BRC_TIMEOUT)) {
- pr
intk(KERN_WARNING "brcompat:
timed out waiting for userspace\n");
+ pr
_warn("
timed out waiting for userspace\n");
goto error;
}
goto error;
}
@@
-531,15
+538,15
@@
static int __init brc_init(void)
goto error;
err = genl_register_ops(&brc_genl_family, &brc_genl_ops_query_dp);
goto error;
err = genl_register_ops(&brc_genl_family, &brc_genl_ops_query_dp);
- if (err != 0)
+ if (err != 0)
goto err_unregister;
err = genl_register_ops(&brc_genl_family, &brc_genl_ops_dp_result);
goto err_unregister;
err = genl_register_ops(&brc_genl_family, &brc_genl_ops_dp_result);
- if (err != 0)
+ if (err != 0)
goto err_unregister;
err = genl_register_ops(&brc_genl_family, &brc_genl_ops_set_proc);
goto err_unregister;
err = genl_register_ops(&brc_genl_family, &brc_genl_ops_set_proc);
- if (err != 0)
+ if (err != 0)
goto err_unregister;
strcpy(brc_mc_group.name, "brcompat");
goto err_unregister;
strcpy(brc_mc_group.name, "brcompat");
@@
-552,7
+559,7
@@
static int __init brc_init(void)
err_unregister:
genl_unregister_family(&brc_genl_family);
error:
err_unregister:
genl_unregister_family(&brc_genl_family);
error:
- pr
intk(KERN_EMERG "brcompat: failed to install!
");
+ pr
_emerg("failed to install!\n
");
return err;
}
return err;
}