Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef6243ac authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

genetlink: optionally validate strictly/dumps 



Add options to strictly validate messages and dump messages,
sometimes perhaps validating dump messages non-strictly may
be required, so add an option for that as well.

Since none of this can really be applied to existing commands,
set the options everwhere using the following spatch:

    @@
    identifier ops;
    expression X;
    @@
    struct genl_ops ops[] = {
    ...,
     {
            .cmd = X,
    +       .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
            ...
     },
    ...
    };

For new commands one should just not copy the .validate 'opt-out'
flags and thus get strict validation.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56738f46

drivers/block/nbd.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -2003,18 +2003,22 @@ static int nbd_genl_reconfigure(struct sk_buff *skb, struct genl_info *info) 
static const struct genl_ops nbd_connect_genl_ops[] = {

static const struct genl_ops nbd_connect_genl_ops[] = {

	{

	{

		.cmd	= NBD_CMD_CONNECT,

		.cmd	= NBD_CMD_CONNECT,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit	= nbd_genl_connect,

		.doit	= nbd_genl_connect,

	},

	},

	{

	{

		.cmd	= NBD_CMD_DISCONNECT,

		.cmd	= NBD_CMD_DISCONNECT,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit	= nbd_genl_disconnect,

		.doit	= nbd_genl_disconnect,

	},

	},

	{

	{

		.cmd	= NBD_CMD_RECONFIGURE,

		.cmd	= NBD_CMD_RECONFIGURE,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit	= nbd_genl_reconfigure,

		.doit	= nbd_genl_reconfigure,

	},

	},

	{

	{

		.cmd	= NBD_CMD_STATUS,

		.cmd	= NBD_CMD_STATUS,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit	= nbd_genl_status,

		.doit	= nbd_genl_status,

	},

	},

};

};

drivers/net/gtp.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -1270,16 +1270,19 @@ static const struct nla_policy gtp_genl_policy[GTPA_MAX + 1] = { 
static const struct genl_ops gtp_genl_ops[] = {

static const struct genl_ops gtp_genl_ops[] = {

	{

	{

		.cmd = GTP_CMD_NEWPDP,

		.cmd = GTP_CMD_NEWPDP,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = gtp_genl_new_pdp,

		.doit = gtp_genl_new_pdp,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = GTP_CMD_DELPDP,

		.cmd = GTP_CMD_DELPDP,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = gtp_genl_del_pdp,

		.doit = gtp_genl_del_pdp,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = GTP_CMD_GETPDP,

		.cmd = GTP_CMD_GETPDP,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = gtp_genl_get_pdp,

		.doit = gtp_genl_get_pdp,

		.dumpit = gtp_genl_dump_pdp,

		.dumpit = gtp_genl_dump_pdp,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

drivers/net/ieee802154/mac802154_hwsim.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -594,31 +594,37 @@ static const struct nla_policy hwsim_genl_policy[MAC802154_HWSIM_ATTR_MAX + 1] = 
static const struct genl_ops hwsim_nl_ops[] = {

static const struct genl_ops hwsim_nl_ops[] = {

	{

	{

		.cmd = MAC802154_HWSIM_CMD_NEW_RADIO,

		.cmd = MAC802154_HWSIM_CMD_NEW_RADIO,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = hwsim_new_radio_nl,

		.doit = hwsim_new_radio_nl,

		.flags = GENL_UNS_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MAC802154_HWSIM_CMD_DEL_RADIO,

		.cmd = MAC802154_HWSIM_CMD_DEL_RADIO,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = hwsim_del_radio_nl,

		.doit = hwsim_del_radio_nl,

		.flags = GENL_UNS_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MAC802154_HWSIM_CMD_GET_RADIO,

		.cmd = MAC802154_HWSIM_CMD_GET_RADIO,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = hwsim_get_radio_nl,

		.doit = hwsim_get_radio_nl,

		.dumpit = hwsim_dump_radio_nl,

		.dumpit = hwsim_dump_radio_nl,

	},

	},

	{

	{

		.cmd = MAC802154_HWSIM_CMD_NEW_EDGE,

		.cmd = MAC802154_HWSIM_CMD_NEW_EDGE,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = hwsim_new_edge_nl,

		.doit = hwsim_new_edge_nl,

		.flags = GENL_UNS_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MAC802154_HWSIM_CMD_DEL_EDGE,

		.cmd = MAC802154_HWSIM_CMD_DEL_EDGE,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = hwsim_del_edge_nl,

		.doit = hwsim_del_edge_nl,

		.flags = GENL_UNS_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MAC802154_HWSIM_CMD_SET_EDGE,

		.cmd = MAC802154_HWSIM_CMD_SET_EDGE,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = hwsim_set_edge_lqi,

		.doit = hwsim_set_edge_lqi,

		.flags = GENL_UNS_ADMIN_PERM,

		.flags = GENL_UNS_ADMIN_PERM,

	},

	},

drivers/net/macsec.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -2637,50 +2637,60 @@ static int macsec_dump_txsc(struct sk_buff *skb, struct netlink_callback *cb) 
static const struct genl_ops macsec_genl_ops[] = {

static const struct genl_ops macsec_genl_ops[] = {

	{

	{

		.cmd = MACSEC_CMD_GET_TXSC,

		.cmd = MACSEC_CMD_GET_TXSC,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.dumpit = macsec_dump_txsc,

		.dumpit = macsec_dump_txsc,

	},

	},

	{

	{

		.cmd = MACSEC_CMD_ADD_RXSC,

		.cmd = MACSEC_CMD_ADD_RXSC,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = macsec_add_rxsc,

		.doit = macsec_add_rxsc,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MACSEC_CMD_DEL_RXSC,

		.cmd = MACSEC_CMD_DEL_RXSC,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = macsec_del_rxsc,

		.doit = macsec_del_rxsc,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MACSEC_CMD_UPD_RXSC,

		.cmd = MACSEC_CMD_UPD_RXSC,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = macsec_upd_rxsc,

		.doit = macsec_upd_rxsc,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MACSEC_CMD_ADD_TXSA,

		.cmd = MACSEC_CMD_ADD_TXSA,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = macsec_add_txsa,

		.doit = macsec_add_txsa,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MACSEC_CMD_DEL_TXSA,

		.cmd = MACSEC_CMD_DEL_TXSA,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = macsec_del_txsa,

		.doit = macsec_del_txsa,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MACSEC_CMD_UPD_TXSA,

		.cmd = MACSEC_CMD_UPD_TXSA,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = macsec_upd_txsa,

		.doit = macsec_upd_txsa,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MACSEC_CMD_ADD_RXSA,

		.cmd = MACSEC_CMD_ADD_RXSA,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = macsec_add_rxsa,

		.doit = macsec_add_rxsa,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MACSEC_CMD_DEL_RXSA,

		.cmd = MACSEC_CMD_DEL_RXSA,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = macsec_del_rxsa,

		.doit = macsec_del_rxsa,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = MACSEC_CMD_UPD_RXSA,

		.cmd = MACSEC_CMD_UPD_RXSA,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = macsec_upd_rxsa,

		.doit = macsec_upd_rxsa,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

drivers/net/team/team.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -2757,20 +2757,24 @@ static int team_nl_cmd_port_list_get(struct sk_buff *skb, 
static const struct genl_ops team_nl_ops[] = {

static const struct genl_ops team_nl_ops[] = {

	{

	{

		.cmd = TEAM_CMD_NOOP,

		.cmd = TEAM_CMD_NOOP,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = team_nl_cmd_noop,

		.doit = team_nl_cmd_noop,

	},

	},

	{

	{

		.cmd = TEAM_CMD_OPTIONS_SET,

		.cmd = TEAM_CMD_OPTIONS_SET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = team_nl_cmd_options_set,

		.doit = team_nl_cmd_options_set,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = TEAM_CMD_OPTIONS_GET,

		.cmd = TEAM_CMD_OPTIONS_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = team_nl_cmd_options_get,

		.doit = team_nl_cmd_options_get,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},

	{

	{

		.cmd = TEAM_CMD_PORT_LIST_GET,

		.cmd = TEAM_CMD_PORT_LIST_GET,

		.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,

		.doit = team_nl_cmd_port_list_get,

		.doit = team_nl_cmd_port_list_get,

		.flags = GENL_ADMIN_PERM,

		.flags = GENL_ADMIN_PERM,

	},

	},