X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fbrcompat.c;h=10a75ece794a4cadb3ea45107da0b3ea2d28ab5a;hb=be51a44695b8e2a3efd729524b2c08d32ed572db;hp=92fcecc216719dce8eb274b96ffb5210c95491ae;hpb=8fef8c7121222233075a03d57db7e0b48d5f6be5;p=openvswitch diff --git a/datapath/brcompat.c b/datapath/brcompat.c index 92fcecc2..10a75ece 100644 --- a/datapath/brcompat.c +++ b/datapath/brcompat.c @@ -1,13 +1,26 @@ /* - * Copyright (c) 2009 Nicira Networks. - * Distributed under the terms of the GNU GPL version 2. + * Copyright (c) 2007-2011 Nicira Networks. * - * Significant portions of this file may be copied from parts of the Linux - * kernel, by Linus Torvalds and others. + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include #include -#include +#include #include #include #include @@ -15,9 +28,7 @@ #include #include -#include "compat.h" #include "openvswitch/brcompat-netlink.h" -#include "brc_procfs.h" #include "datapath.h" static struct genl_family brc_genl_family; @@ -39,11 +50,12 @@ static DECLARE_COMPLETION(brc_done); /* Userspace signaled operation done? */ static struct sk_buff *brc_reply; /* Reply from userspace. */ static u32 brc_seq; /* Sequence number for current op. */ -static struct sk_buff *brc_send_command(struct sk_buff *, struct nlattr **attrs); +static struct sk_buff *brc_send_command(struct sk_buff *, + struct nlattr **attrs); static int brc_send_simple_command(struct sk_buff *); -static struct sk_buff * -brc_make_request(int op, const char *bridge, const char *port) +static struct sk_buff *brc_make_request(int op, const char *bridge, + const char *port) { struct sk_buff *skb = genlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL); if (!skb) @@ -82,6 +94,9 @@ static int brc_add_del_bridge(char __user *uname, int add) struct sk_buff *request; char name[IFNAMSIZ]; + if (!capable(CAP_NET_ADMIN)) + return -EPERM; + if (copy_from_user(name, uname, IFNAMSIZ)) return -EFAULT; @@ -146,8 +161,7 @@ static int brc_get_bridges(int __user *uindices, int n) } /* Legacy deviceless bridge ioctl's. Called with br_ioctl_mutex. */ -static int -old_deviceless(void __user *uarg) +static int old_deviceless(void __user *uarg) { unsigned long args[3]; @@ -189,13 +203,15 @@ brc_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __user *uarg) return -EOPNOTSUPP; } -static int -brc_add_del_port(struct net_device *dev, int port_ifindex, int add) +static int brc_add_del_port(struct net_device *dev, int port_ifindex, int add) { struct sk_buff *request; 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; @@ -214,18 +230,17 @@ brc_add_del_port(struct net_device *dev, int port_ifindex, int add) return err; } -static int -brc_get_bridge_info(struct net_device *dev, struct __bridge_info __user *ub) +static int brc_get_bridge_info(struct net_device *dev, + struct __bridge_info __user *ub) { struct __bridge_info b; - u64 id = 0; - int i; memset(&b, 0, sizeof(struct __bridge_info)); - for (i=0; idev_addr[i] << (8*(ETH_ALEN-1 - i)); - b.bridge_id = cpu_to_be64(id); + /* First two bytes are the priority, which we should skip. This comes + * from struct bridge_id in br_private.h, which is unavailable to us. + */ + memcpy((u8 *)&b.bridge_id + 2, dev->dev_addr, ETH_ALEN); b.stp_enabled = 0; if (copy_to_user(ub, &b, sizeof(struct __bridge_info))) @@ -234,8 +249,8 @@ brc_get_bridge_info(struct net_device *dev, struct __bridge_info __user *ub) return 0; } -static int -brc_get_port_list(struct net_device *dev, int __user *uindices, int num) +static int brc_get_port_list(struct net_device *dev, int __user *uindices, + int num) { int retval; @@ -254,7 +269,7 @@ brc_get_port_list(struct net_device *dev, int __user *uindices, int num) * (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]; @@ -306,8 +321,7 @@ nla_put_failure: } /* Legacy ioctl's through SIOCDEVPRIVATE. Called with rtnl_lock. */ -static int -old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { unsigned long args[4]; @@ -335,24 +349,23 @@ old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } /* Called with the rtnl_lock. */ -static int -brc_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +static int brc_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { int err; switch (cmd) { - case SIOCDEVPRIVATE: - err = old_dev_ioctl(dev, rq, cmd); - break; - - case SIOCBRADDIF: - return brc_add_del_port(dev, rq->ifr_ifindex, 1); - case SIOCBRDELIF: - return brc_add_del_port(dev, rq->ifr_ifindex, 0); - - default: - err = -EOPNOTSUPP; - break; + case SIOCDEVPRIVATE: + err = old_dev_ioctl(dev, rq, cmd); + break; + + case SIOCBRADDIF: + return brc_add_del_port(dev, rq->ifr_ifindex, 1); + case SIOCBRDELIF: + return brc_add_del_port(dev, rq->ifr_ifindex, 0); + + default: + err = -EOPNOTSUPP; + break; } return err; @@ -374,7 +387,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); - if (!ans_skb) + if (!ans_skb) return -ENOMEM; data = genlmsg_put_reply(ans_skb, info, &brc_genl_family, @@ -394,27 +407,13 @@ nla_put_failure: return err; } -static struct genl_ops brc_genl_ops_query_dp = { - .cmd = BRC_GENL_C_QUERY_MC, - .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privelege. */ - .policy = NULL, - .doit = brc_genl_query, - .dumpit = NULL -}; - /* Attribute policy: what each attribute may contain. */ static struct nla_policy brc_genl_policy[BRC_GENL_A_MAX + 1] = { [BRC_GENL_A_ERR_CODE] = { .type = NLA_U32 }, - - [BRC_GENL_A_PROC_DIR] = { .type = NLA_NUL_STRING }, - [BRC_GENL_A_PROC_NAME] = { .type = NLA_NUL_STRING }, - [BRC_GENL_A_PROC_DATA] = { .type = NLA_NUL_STRING }, - [BRC_GENL_A_FDB_DATA] = { .type = NLA_UNSPEC }, }; -static int -brc_genl_dp_result(struct sk_buff *skb, struct genl_info *info) +static int brc_genl_dp_result(struct sk_buff *skb, struct genl_info *info) { unsigned long int flags; int err; @@ -430,8 +429,7 @@ brc_genl_dp_result(struct sk_buff *skb, struct genl_info *info) 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); @@ -445,23 +443,21 @@ brc_genl_dp_result(struct sk_buff *skb, struct genl_info *info) return err; } -static struct genl_ops brc_genl_ops_dp_result = { - .cmd = BRC_GENL_C_DP_RESULT, - .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privelege. */ - .policy = brc_genl_policy, - .doit = brc_genl_dp_result, - .dumpit = NULL +static struct genl_ops brc_genl_ops[] = { + { .cmd = BRC_GENL_C_QUERY_MC, + .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privelege. */ + .policy = NULL, + .doit = brc_genl_query, + }, + { .cmd = BRC_GENL_C_DP_RESULT, + .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privelege. */ + .policy = brc_genl_policy, + .doit = brc_genl_dp_result, + }, }; -static struct genl_ops brc_genl_ops_set_proc = { - .cmd = BRC_GENL_C_SET_PROC, - .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privelege. */ - .policy = brc_genl_policy, - .doit = brc_genl_set_proc, - .dumpit = NULL -}; - -static struct sk_buff *brc_send_command(struct sk_buff *request, struct nlattr **attrs) +static struct sk_buff *brc_send_command(struct sk_buff *request, + struct nlattr **attrs) { unsigned long int flags; struct sk_buff *reply; @@ -485,8 +481,10 @@ static struct sk_buff *brc_send_command(struct sk_buff *request, struct nlattr * /* Wait for reply. */ error = -ETIMEDOUT; - if (!wait_for_completion_timeout(&brc_done, BRC_TIMEOUT)) + if (!wait_for_completion_timeout(&brc_done, BRC_TIMEOUT)) { + pr_warn("timed out waiting for userspace\n"); goto error; + } /* Grab reply. */ spin_lock_irqsave(&brc_lock, flags); @@ -509,18 +507,17 @@ error: return ERR_PTR(error); } -static int -__init brc_init(void) +static int __init brc_init(void) { int err; - printk("Open vSwitch Bridge Compatibility, built "__DATE__" "__TIME__"\n"); + pr_info("Open vSwitch Bridge Compatibility, built "__DATE__" "__TIME__"\n"); /* Set the bridge ioctl handler */ brioctl_set(brc_ioctl_deviceless_stub); /* Set the openvswitch_mod device ioctl handler */ - dp_ioctl_hook = brc_dev_ioctl; + ovs_dp_ioctl_hook = brc_dev_ioctl; /* Randomize the initial sequence number. This is not a security * feature; it only helps avoid crossed wires between userspace and @@ -529,22 +526,11 @@ __init brc_init(void) /* Register generic netlink family to communicate changes to * userspace. */ - err = genl_register_family(&brc_genl_family); + err = genl_register_family_with_ops(&brc_genl_family, + brc_genl_ops, ARRAY_SIZE(brc_genl_ops)); if (err) goto error; - err = genl_register_ops(&brc_genl_family, &brc_genl_ops_query_dp); - if (err != 0) - goto err_unregister; - - err = genl_register_ops(&brc_genl_family, &brc_genl_ops_dp_result); - if (err != 0) - goto err_unregister; - - err = genl_register_ops(&brc_genl_family, &brc_genl_ops_set_proc); - if (err != 0) - goto err_unregister; - strcpy(brc_mc_group.name, "brcompat"); err = genl_register_mc_group(&brc_genl_family, &brc_mc_group); if (err < 0) @@ -555,19 +541,17 @@ __init brc_init(void) err_unregister: genl_unregister_family(&brc_genl_family); error: - printk(KERN_EMERG "brcompat: failed to install!"); + pr_emerg("failed to install!\n"); return err; } -static void -brc_cleanup(void) +static void brc_cleanup(void) { /* Unregister ioctl hooks */ - dp_ioctl_hook = NULL; + ovs_dp_ioctl_hook = NULL; brioctl_set(NULL); genl_unregister_family(&brc_genl_family); - brc_procfs_exit(); } module_init(brc_init);