genetlink: start to validate reserved header bytes

We had historically not checked that genlmsghdr.reserved
is 0 on input which prevents us from using those precious
bytes in the future.

One use case would be to extend the cmd field, which is
currently just 8 bits wide and 256 is not a lot of commands
for some core families.

To make sure that new families do the right thing by default
put the onus of opting out of validation on existing families.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Paul Moore <paul@paul-moore.com> (NetLabel)
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 2a709daefbc465c41f6e03f38382655e9a35b875..6cec9ce23fd39bed686323f80d6146079b176512 100644 (file)
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -2322,6 +2322,7 @@ static struct genl_family nbd_genl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = nbd_connect_genl_ops,
        .n_small_ops    = ARRAY_SIZE(nbd_connect_genl_ops),
+       .resv_start_op  = NBD_CMD_STATUS + 1,
        .maxattr        = NBD_ATTR_MAX,
        .policy = nbd_attr_policy,
        .mcgrps         = nbd_mcast_grps,

diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c
index a208e2b1a9af224e3a9d51facdcd75f02a8e8e55..15c7dc82107f45fc068be92b43d29d3ff9d9ee72 100644 (file)
--- a/drivers/net/gtp.c
+++ b/drivers/net/gtp.c
@@ -1859,6 +1859,7 @@ static struct genl_family gtp_genl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = gtp_genl_ops,
        .n_small_ops    = ARRAY_SIZE(gtp_genl_ops),
+       .resv_start_op  = GTP_CMD_ECHOREQ + 1,
        .mcgrps         = gtp_genl_mcgrps,
        .n_mcgrps       = ARRAY_SIZE(gtp_genl_mcgrps),
 };

diff --git a/drivers/net/ieee802154/mac802154_hwsim.c b/drivers/net/ieee802154/mac802154_hwsim.c
index 38c217bd7c8226c174a6f35a20047f7b8f027b69..2f0544dd7c2ad918480b4f00c3c24962412687b0 100644 (file)
--- a/drivers/net/ieee802154/mac802154_hwsim.c
+++ b/drivers/net/ieee802154/mac802154_hwsim.c
@@ -630,6 +630,7 @@ static struct genl_family hwsim_genl_family __ro_after_init = {
        .module = THIS_MODULE,
        .small_ops = hwsim_nl_ops,
        .n_small_ops = ARRAY_SIZE(hwsim_nl_ops),
+       .resv_start_op = MAC802154_HWSIM_CMD_NEW_EDGE + 1,
        .mcgrps = hwsim_mcgrps,
        .n_mcgrps = ARRAY_SIZE(hwsim_mcgrps),
 };

diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index c6d271e5687e9e047ee947bbbe10fd9dae29a13e..adf448a8162b5fd150b6d9203922473311a1ba26 100644 (file)
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -3404,6 +3404,7 @@ static struct genl_family macsec_fam __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = macsec_genl_ops,
        .n_small_ops    = ARRAY_SIZE(macsec_genl_ops),
+       .resv_start_op  = MACSEC_CMD_UPD_OFFLOAD + 1,
 };
 
 static netdev_tx_t macsec_start_xmit(struct sk_buff *skb,

diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
index aac133a1e27a5f64fe8f83a456aa0598fad6824c..b1e1239dfadef6296a3e7539104355d3083378a5 100644 (file)
--- a/drivers/net/team/team.c
+++ b/drivers/net/team/team.c
@@ -2840,6 +2840,7 @@ static struct genl_family team_nl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = team_nl_ops,
        .n_small_ops    = ARRAY_SIZE(team_nl_ops),
+       .resv_start_op  = TEAM_CMD_PORT_LIST_GET + 1,
        .mcgrps         = team_nl_mcgrps,
        .n_mcgrps       = ARRAY_SIZE(team_nl_mcgrps),
 };

diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c
index d0f3b6d7f40894fdee515c471295d3516da9b13d..0c0644e762e59be435747a043beb1f24beef2e4a 100644 (file)
--- a/drivers/net/wireguard/netlink.c
+++ b/drivers/net/wireguard/netlink.c
@@ -621,6 +621,7 @@ static const struct genl_ops genl_ops[] = {
 static struct genl_family genl_family __ro_after_init = {
        .ops = genl_ops,
        .n_ops = ARRAY_SIZE(genl_ops),
+       .resv_start_op = WG_CMD_SET_DEVICE + 1,
        .name = WG_GENL_NAME,
        .version = WG_GENL_VERSION,
        .maxattr = WGDEVICE_A_MAX,

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 4fb8f68e5c3b79ebe80f9a481fbdf2447d3abc50..d9054104725e2773792ceb0ac43147e2601ef9ca 100644 (file)
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -5288,6 +5288,7 @@ static struct genl_family hwsim_genl_family __ro_after_init = {
        .module = THIS_MODULE,
        .small_ops = hwsim_ops,
        .n_small_ops = ARRAY_SIZE(hwsim_ops),
+       .resv_start_op = HWSIM_CMD_DEL_MAC_ADDR + 1,
        .mcgrps = hwsim_mcgrps,
        .n_mcgrps = ARRAY_SIZE(hwsim_mcgrps),
 };

diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 3deaeecb712e35e1b8720cf40c3cf7fd44ec4706..2940559c30860bf36ab4314aa234425610b82917 100644 (file)
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -486,6 +486,7 @@ static struct genl_family tcmu_genl_family __ro_after_init = {
        .netnsok = true,
        .small_ops = tcmu_genl_ops,
        .n_small_ops = ARRAY_SIZE(tcmu_genl_ops),
+       .resv_start_op = TCMU_CMD_SET_FEATURES + 1,
 };
 
 #define tcmu_cmd_set_dbi_cur(cmd, index) ((cmd)->dbi_cur = (index))

diff --git a/drivers/thermal/thermal_netlink.c b/drivers/thermal/thermal_netlink.c
index 050d243a5fa1f9620ec69be700e11f2c03f97889..e2d78a996b5f320c3b9ae63a6575e1fa23ea272a 100644 (file)
--- a/drivers/thermal/thermal_netlink.c
+++ b/drivers/thermal/thermal_netlink.c
@@ -693,6 +693,7 @@ static struct genl_family thermal_gnl_family __ro_after_init = {
        .policy         = thermal_genl_policy,
        .small_ops      = thermal_genl_ops,
        .n_small_ops    = ARRAY_SIZE(thermal_genl_ops),
+       .resv_start_op  = THERMAL_GENL_CMD_CDEV_GET + 1,
        .mcgrps         = thermal_genl_mcgrps,
        .n_mcgrps       = ARRAY_SIZE(thermal_genl_mcgrps),
 };

diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c
index c06c02704461006baa4d2a60db2a30640b100b42..7badf57775972516a158ea7b48fff5c70da899e9 100644 (file)
--- a/drivers/vdpa/vdpa.c
+++ b/drivers/vdpa/vdpa.c
@@ -1183,6 +1183,7 @@ static struct genl_family vdpa_nl_family __ro_after_init = {
        .module = THIS_MODULE,
        .ops = vdpa_nl_ops,
        .n_ops = ARRAY_SIZE(vdpa_nl_ops),
+       .resv_start_op = VDPA_CMD_DEV_VSTATS_GET + 1,
 };
 
 static int vdpa_init(void)

diff --git a/fs/cifs/netlink.c b/fs/cifs/netlink.c
index 291cb606f149679298d46cafe1aa7cee9da16ae1..147d9409252cd3b22bbd0e5436d97867b6309413 100644 (file)
--- a/fs/cifs/netlink.c
+++ b/fs/cifs/netlink.c
@@ -51,6 +51,7 @@ struct genl_family cifs_genl_family = {
        .policy         = cifs_genl_policy,
        .ops            = cifs_genl_ops,
        .n_ops          = ARRAY_SIZE(cifs_genl_ops),
+       .resv_start_op  = CIFS_GENL_CMD_SWN_NOTIFY + 1,
        .mcgrps         = cifs_genl_mcgrps,
        .n_mcgrps       = ARRAY_SIZE(cifs_genl_mcgrps),
 };

diff --git a/fs/dlm/netlink.c b/fs/dlm/netlink.c
index 67f68d48d60ceaa470d1154deb43f2991511fc8c..4de4b8651c6cc290c249b9fa8160361a677c1089 100644 (file)
--- a/fs/dlm/netlink.c
+++ b/fs/dlm/netlink.c
@@ -75,6 +75,7 @@ static struct genl_family family __ro_after_init = {
        .version        = DLM_GENL_VERSION,
        .small_ops      = dlm_nl_ops,
        .n_small_ops    = ARRAY_SIZE(dlm_nl_ops),
+       .resv_start_op  = DLM_CMD_HELLO + 1,
        .module         = THIS_MODULE,
 };
 

diff --git a/fs/ksmbd/transport_ipc.c b/fs/ksmbd/transport_ipc.c
index 7cb0eeb07c80876c3504edb88a8550ffb434a533..c9aca21637d5b688470338046cebd542ea5c91a2 100644 (file)
--- a/fs/ksmbd/transport_ipc.c
+++ b/fs/ksmbd/transport_ipc.c
@@ -197,6 +197,7 @@ static struct genl_family ksmbd_genl_family = {
        .module         = THIS_MODULE,
        .ops            = ksmbd_genl_ops,
        .n_ops          = ARRAY_SIZE(ksmbd_genl_ops),
+       .resv_start_op  = KSMBD_EVENT_SPNEGO_AUTHEN_RESPONSE + 1,
 };
 
 static void ksmbd_nl_init_fixup(void)

diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
index 939b1a8f571b4fa8e02a58156cd51683bd76bf44..4a4b387181ade4e7296e8a1da540a6b8d61818e4 100644 (file)
--- a/include/linux/genl_magic_func.h
+++ b/include/linux/genl_magic_func.h
@@ -294,6 +294,7 @@ static struct genl_family ZZZ_genl_family __ro_after_init = {
        .ops = ZZZ_genl_ops,
        .n_ops = ARRAY_SIZE(ZZZ_genl_ops),
        .mcgrps = ZZZ_genl_mcgrps,
+       .resv_start_op = 42, /* drbd is currently the only user */
        .n_mcgrps = ARRAY_SIZE(ZZZ_genl_mcgrps),
        .module = THIS_MODULE,
 };

diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 56a50e1c51b97d1b6aebeb1b594df78485f38d8b..a4827b5e1e07bb4f139bb077914f74d39588e436 100644 (file)
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -39,6 +39,8 @@ struct genl_info;
  *     undo operations done by pre_doit, for example release locks
  * @mcgrps: multicast groups used by this family
  * @n_mcgrps: number of multicast groups
+ * @resv_start_op: first operation for which reserved fields of the header
+ *     can be validated, new families should leave this field at zero
  * @mcgrp_offset: starting number of multicast group IDs in this family
  *     (private)
  * @ops: the operations supported by this family
@@ -58,6 +60,7 @@ struct genl_family {
        u8                      n_ops;
        u8                      n_small_ops;
        u8                      n_mcgrps;
+       u8                      resv_start_op;
        const struct nla_policy *policy;
        int                     (*pre_doit)(const struct genl_ops *ops,
                                            struct sk_buff *skb,

diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index f7e246336218e559c0e5fa0a9d37cc3778fe40b7..8ce3fa0c19e2d7ae7457469da00d184d5834aadc 100644 (file)
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -688,6 +688,7 @@ static struct genl_family family __ro_after_init = {
        .module         = THIS_MODULE,
        .ops            = taskstats_ops,
        .n_ops          = ARRAY_SIZE(taskstats_ops),
+       .resv_start_op  = CGROUPSTATS_CMD_GET + 1,
        .netnsok        = true,
 };
 

diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 00875e1d8c44cde121c936a16965fb171ec6f3f1..a5e4a4e976cf3c8dc042ede58e812bbae5d5401f 100644 (file)
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -1493,6 +1493,7 @@ struct genl_family batadv_netlink_family __ro_after_init = {
        .module = THIS_MODULE,
        .small_ops = batadv_netlink_ops,
        .n_small_ops = ARRAY_SIZE(batadv_netlink_ops),
+       .resv_start_op = BATADV_CMD_SET_VLAN + 1,
        .mcgrps = batadv_netlink_mcgrps,
        .n_mcgrps = ARRAY_SIZE(batadv_netlink_mcgrps),
 };

diff --git a/net/core/devlink.c b/net/core/devlink.c
index 2afbeb6eca67211bf6cb3f68f09c41a1fa77298e..3396fdf802b642d27852f12f0679ade6dba92366 100644 (file)
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -9610,6 +9610,7 @@ static struct genl_family devlink_nl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = devlink_nl_ops,
        .n_small_ops    = ARRAY_SIZE(devlink_nl_ops),
+       .resv_start_op  = DEVLINK_CMD_SELFTESTS_RUN + 1,
        .mcgrps         = devlink_nl_mcgrps,
        .n_mcgrps       = ARRAY_SIZE(devlink_nl_mcgrps),
 };

diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 876664fc605e61b0ec51cd82bd1d046add34f6f0..f084a4a6b7ab2c7e5b822be89a34d3c4dd2cc0f6 100644 (file)
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -1645,6 +1645,7 @@ static struct genl_family net_drop_monitor_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = dropmon_ops,
        .n_small_ops    = ARRAY_SIZE(dropmon_ops),
+       .resv_start_op  = NET_DM_CMD_STATS_GET + 1,
        .mcgrps         = dropmon_mcgrps,
        .n_mcgrps       = ARRAY_SIZE(dropmon_mcgrps),
 };

diff --git a/net/ethtool/netlink.c b/net/ethtool/netlink.c
index e26079e11835ceeda18b7356b787d75f547d9946..d5e77f1cbbfac24a65480225a08963f69dc2e98d 100644 (file)
--- a/net/ethtool/netlink.c
+++ b/net/ethtool/netlink.c
@@ -1033,6 +1033,7 @@ static struct genl_family ethtool_genl_family __ro_after_init = {
        .parallel_ops   = true,
        .ops            = ethtool_genl_ops,
        .n_ops          = ARRAY_SIZE(ethtool_genl_ops),
+       .resv_start_op  = ETHTOOL_MSG_MODULE_GET + 1,
        .mcgrps         = ethtool_nl_mcgrps,
        .n_mcgrps       = ARRAY_SIZE(ethtool_nl_mcgrps),
 };

diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
index 1405c037cf7ab8b42986362336160396206744f0..7174a9092900266c43ac00da4e62130da8ee7dc3 100644 (file)
--- a/net/hsr/hsr_netlink.c
+++ b/net/hsr/hsr_netlink.c
@@ -522,6 +522,7 @@ static struct genl_family hsr_genl_family __ro_after_init = {
        .module = THIS_MODULE,
        .small_ops = hsr_ops,
        .n_small_ops = ARRAY_SIZE(hsr_ops),
+       .resv_start_op = HSR_C_SET_NODE_LIST + 1,
        .mcgrps = hsr_mcgrps,
        .n_mcgrps = ARRAY_SIZE(hsr_mcgrps),
 };

diff --git a/net/ieee802154/netlink.c b/net/ieee802154/netlink.c
index b07abc38b4b3d6a73b7a6968aa2d6fc5f7f1f293..7d2de4ee6992b75a0b86eb5e44e5d40d20a98968 100644 (file)
--- a/net/ieee802154/netlink.c
+++ b/net/ieee802154/netlink.c
@@ -132,6 +132,7 @@ struct genl_family nl802154_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = ieee802154_ops,
        .n_small_ops    = ARRAY_SIZE(ieee802154_ops),
+       .resv_start_op  = IEEE802154_LLSEC_DEL_SECLEVEL + 1,
        .mcgrps         = ieee802154_mcgrps,
        .n_mcgrps       = ARRAY_SIZE(ieee802154_mcgrps),
 };

diff --git a/net/ieee802154/nl802154.c b/net/ieee802154/nl802154.c
index e0b072aecf0f30fe5b410ef0418fc01c765474c9..38c4f3cb010e89f8cd31c453e2fdd1f2291886c5 100644 (file)
--- a/net/ieee802154/nl802154.c
+++ b/net/ieee802154/nl802154.c
@@ -2500,6 +2500,7 @@ static struct genl_family nl802154_fam __ro_after_init = {
        .module = THIS_MODULE,
        .ops = nl802154_ops,
        .n_ops = ARRAY_SIZE(nl802154_ops),
+       .resv_start_op = NL802154_CMD_DEL_SEC_LEVEL + 1,
        .mcgrps = nl802154_mcgrps,
        .n_mcgrps = ARRAY_SIZE(nl802154_mcgrps),
 };

diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index cb5bfb77944cabea2fb88237436f29f3596e1391..0c3c6d0cee290cfef07ec8f3fa7e2089f68db341 100644 (file)
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -928,6 +928,7 @@ static struct genl_family fou_nl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = fou_nl_ops,
        .n_small_ops    = ARRAY_SIZE(fou_nl_ops),
+       .resv_start_op  = FOU_CMD_GET + 1,
 };
 
 size_t fou_encap_hlen(struct ip_tunnel_encap *e)

diff --git a/net/ipv4/tcp_metrics.c b/net/ipv4/tcp_metrics.c
index d58e672be31c764805ca6ad120459eb2d86b4d87..82f4575f9cd90049a5ad4c7329ad1ddc28fc1aa0 100644 (file)
--- a/net/ipv4/tcp_metrics.c
+++ b/net/ipv4/tcp_metrics.c
@@ -969,6 +969,7 @@ static struct genl_family tcp_metrics_nl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = tcp_metrics_nl_ops,
        .n_small_ops    = ARRAY_SIZE(tcp_metrics_nl_ops),
+       .resv_start_op  = TCP_METRICS_CMD_DEL + 1,
 };
 
 static unsigned int tcpmhash_entries;

diff --git a/net/ipv6/ila/ila_main.c b/net/ipv6/ila/ila_main.c
index 36c58aa257e88c9a918f6664e85dce7fe7e3d246..3faf62530d6a4338686a564ecabd147b806263c9 100644 (file)
--- a/net/ipv6/ila/ila_main.c
+++ b/net/ipv6/ila/ila_main.c
@@ -55,6 +55,7 @@ struct genl_family ila_nl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .ops            = ila_nl_ops,
        .n_ops          = ARRAY_SIZE(ila_nl_ops),
+       .resv_start_op  = ILA_CMD_FLUSH + 1,
 };
 
 static __net_init int ila_init_net(struct net *net)

diff --git a/net/ipv6/ioam6.c b/net/ipv6/ioam6.c
index 1098131ed90c5027480dd2fd83e77cd531ddcfe4..571f0e4d9cf3d085bf19a6497aa33623d1532aeb 100644 (file)
--- a/net/ipv6/ioam6.c
+++ b/net/ipv6/ioam6.c
@@ -619,6 +619,7 @@ static struct genl_family ioam6_genl_family __ro_after_init = {
        .parallel_ops   = true,
        .ops            = ioam6_genl_ops,
        .n_ops          = ARRAY_SIZE(ioam6_genl_ops),
+       .resv_start_op  = IOAM6_CMD_NS_SET_SCHEMA + 1,
        .module         = THIS_MODULE,
 };
 

diff --git a/net/ipv6/seg6.c b/net/ipv6/seg6.c
index 73aaabf0e966551a1b1e12b12888475a13dbf74b..5421cc7c935f5ef1da9c136ce0a94bde1b86e96e 100644 (file)
--- a/net/ipv6/seg6.c
+++ b/net/ipv6/seg6.c
@@ -499,6 +499,7 @@ static struct genl_family seg6_genl_family __ro_after_init = {
        .parallel_ops   = true,
        .ops            = seg6_genl_ops,
        .n_ops          = ARRAY_SIZE(seg6_genl_ops),
+       .resv_start_op  = SEG6_CMD_GET_TUNSRC + 1,
        .module         = THIS_MODULE,
 };
 

diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index 96eb91be9238ba13413e7948df07f1084389fd83..a901fd14fe3bfe320951475f5f8a0880c3bdf865 100644 (file)
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -989,6 +989,7 @@ static struct genl_family l2tp_nl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = l2tp_nl_ops,
        .n_small_ops    = ARRAY_SIZE(l2tp_nl_ops),
+       .resv_start_op  = L2TP_CMD_SESSION_GET + 1,
        .mcgrps         = l2tp_multicast_group,
        .n_mcgrps       = ARRAY_SIZE(l2tp_multicast_group),
 };

diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 291b5da42fdb647278dbff41dc8cec6b2df10b30..a3e4ee7af0ee0cc64fe0208dd3beab4ac29160d7 100644 (file)
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -2280,6 +2280,7 @@ static struct genl_family mptcp_genl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = mptcp_pm_ops,
        .n_small_ops    = ARRAY_SIZE(mptcp_pm_ops),
+       .resv_start_op  = MPTCP_PM_CMD_SUBFLOW_DESTROY + 1,
        .mcgrps         = mptcp_pm_mcgrps,
        .n_mcgrps       = ARRAY_SIZE(mptcp_pm_mcgrps),
 };

diff --git a/net/ncsi/ncsi-netlink.c b/net/ncsi/ncsi-netlink.c
index c189b4c8a1823e328367c2c98ff9caf5be69286b..d27f4eccce6d79e649dc8e6d84d4113c0f5b6cd6 100644 (file)
--- a/net/ncsi/ncsi-netlink.c
+++ b/net/ncsi/ncsi-netlink.c
@@ -768,6 +768,7 @@ static struct genl_family ncsi_genl_family __ro_after_init = {
        .module = THIS_MODULE,
        .small_ops = ncsi_ops,
        .n_small_ops = ARRAY_SIZE(ncsi_ops),
+       .resv_start_op = NCSI_CMD_SET_CHANNEL_MASK + 1,
 };
 
 static int __init ncsi_init_netlink(void)

diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index efab2b06d3732b522b9e5d07982abf0363870fff..818b0b058b10c06e634610e67faff65ac4583d7f 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -4005,6 +4005,7 @@ static struct genl_family ip_vs_genl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = ip_vs_genl_ops,
        .n_small_ops    = ARRAY_SIZE(ip_vs_genl_ops),
+       .resv_start_op  = IPVS_CMD_FLUSH + 1,
 };
 
 static int __init ip_vs_genl_register(void)

diff --git a/net/netlabel/netlabel_calipso.c b/net/netlabel/netlabel_calipso.c
index 91a19c3ea1a365a871dcf6a617e7f301bf5f899e..f1d5b8465217802a3015cae4edef70cf67b22834 100644 (file)
--- a/net/netlabel/netlabel_calipso.c
+++ b/net/netlabel/netlabel_calipso.c
@@ -344,6 +344,7 @@ static struct genl_family netlbl_calipso_gnl_family __ro_after_init = {
        .module = THIS_MODULE,
        .small_ops = netlbl_calipso_ops,
        .n_small_ops = ARRAY_SIZE(netlbl_calipso_ops),
+       .resv_start_op = NLBL_CALIPSO_C_LISTALL + 1,
 };
 
 /* NetLabel Generic NETLINK Protocol Functions

diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index 894e6b8f1a8681605dbeefe41fa5a22c3e8a3b43..fa08ee75ac0635c38054629c70ed620b6c4a4def 100644 (file)
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -767,6 +767,7 @@ static struct genl_family netlbl_cipsov4_gnl_family __ro_after_init = {
        .module = THIS_MODULE,
        .small_ops = netlbl_cipsov4_ops,
        .n_small_ops = ARRAY_SIZE(netlbl_cipsov4_ops),
+       .resv_start_op = NLBL_CIPSOV4_C_LISTALL + 1,
 };
 
 /*

diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c
index 032b7d7b32c7658fa9bcf9d335eaaefe0cb54f7e..689eaa2afbecd73118f9ed2ec10ba2be5ce39c4f 100644 (file)
--- a/net/netlabel/netlabel_mgmt.c
+++ b/net/netlabel/netlabel_mgmt.c
@@ -826,6 +826,7 @@ static struct genl_family netlbl_mgmt_gnl_family __ro_after_init = {
        .module = THIS_MODULE,
        .small_ops = netlbl_mgmt_genl_ops,
        .n_small_ops = ARRAY_SIZE(netlbl_mgmt_genl_ops),
+       .resv_start_op = NLBL_MGMT_C_VERSION + 1,
 };
 
 /*

diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index 0555dffd80e0533ad84cf9bb94cba37cfd0c3c61..9996883bf2b78d3ca0399fc622679e4bb04d5541 100644 (file)
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -1374,6 +1374,7 @@ static struct genl_family netlbl_unlabel_gnl_family __ro_after_init = {
        .module = THIS_MODULE,
        .small_ops = netlbl_unlabel_genl_ops,
        .n_small_ops = ARRAY_SIZE(netlbl_unlabel_genl_ops),
+       .resv_start_op = NLBL_UNLABEL_C_STATICLISTDEF + 1,
 };
 
 /*

diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 76aed0571e3a6d31d0ca2171b590cf7536321fa3..7c136de117eb8b30e1d8474851d7b8a9530990ab 100644 (file)
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -757,6 +757,9 @@ static int genl_family_rcv_msg(const struct genl_family *family,
        if (nlh->nlmsg_len < nlmsg_msg_size(hdrlen))
                return -EINVAL;
 
+       if (hdr->cmd >= family->resv_start_op && hdr->reserved)
+               return -EINVAL;
+
        if (genl_get_cmd(hdr->cmd, family, &op))
                return -EOPNOTSUPP;
 
@@ -1348,6 +1351,7 @@ static struct genl_family genl_ctrl __ro_after_init = {
        .module = THIS_MODULE,
        .ops = genl_ctrl_ops,
        .n_ops = ARRAY_SIZE(genl_ctrl_ops),
+       .resv_start_op = CTRL_CMD_GETPOLICY + 1,
        .mcgrps = genl_ctrl_groups,
        .n_mcgrps = ARRAY_SIZE(genl_ctrl_groups),
        .id = GENL_ID_CTRL,

diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c
index 7c62417ccfd78a76937fa7cf7491b5556d5a1603..9d91087b93992bdf90f1f6a4f8960c3eed77d81b 100644 (file)
--- a/net/nfc/netlink.c
+++ b/net/nfc/netlink.c
@@ -1783,6 +1783,7 @@ static struct genl_family nfc_genl_family __ro_after_init = {
        .module = THIS_MODULE,
        .ops = nfc_genl_ops,
        .n_ops = ARRAY_SIZE(nfc_genl_ops),
+       .resv_start_op = NFC_CMD_DEACTIVATE_TARGET + 1,
        .mcgrps = nfc_genl_mcgrps,
        .n_mcgrps = ARRAY_SIZE(nfc_genl_mcgrps),
 };

diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 4e70df91d0f2a08f36c2b19860cf21924739bafb..48e8f5c29b67eea5ffb617bc782c61a412e210f9 100644 (file)
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -2283,6 +2283,7 @@ struct genl_family dp_ct_limit_genl_family __ro_after_init = {
        .parallel_ops = true,
        .small_ops = ct_limit_genl_ops,
        .n_small_ops = ARRAY_SIZE(ct_limit_genl_ops),
+       .resv_start_op = OVS_CT_LIMIT_CMD_GET + 1,
        .mcgrps = &ovs_ct_limit_multicast_group,
        .n_mcgrps = 1,
        .module = THIS_MODULE,

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index e4667700336b0ac24a1f7f13f06c2486b85bab46..8f49e2359a1b9395bb73b75c60e8b995893d77d4 100644 (file)
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -692,6 +692,7 @@ static struct genl_family dp_packet_genl_family __ro_after_init = {
        .parallel_ops = true,
        .small_ops = dp_packet_genl_ops,
        .n_small_ops = ARRAY_SIZE(dp_packet_genl_ops),
+       .resv_start_op = OVS_PACKET_CMD_EXECUTE + 1,
        .module = THIS_MODULE,
 };
 
@@ -1509,6 +1510,7 @@ static struct genl_family dp_flow_genl_family __ro_after_init = {
        .parallel_ops = true,
        .small_ops = dp_flow_genl_ops,
        .n_small_ops = ARRAY_SIZE(dp_flow_genl_ops),
+       .resv_start_op = OVS_FLOW_CMD_SET + 1,
        .mcgrps = &ovs_dp_flow_multicast_group,
        .n_mcgrps = 1,
        .module = THIS_MODULE,
@@ -2051,6 +2053,7 @@ static struct genl_family dp_datapath_genl_family __ro_after_init = {
        .parallel_ops = true,
        .small_ops = dp_datapath_genl_ops,
        .n_small_ops = ARRAY_SIZE(dp_datapath_genl_ops),
+       .resv_start_op = OVS_DP_CMD_SET + 1,
        .mcgrps = &ovs_dp_datapath_multicast_group,
        .n_mcgrps = 1,
        .module = THIS_MODULE,

diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 04a060ac7fdf6e1f7de8fbf19880870ece8ea520..51111a9009bdb73009b3103c05723042f823716e 100644 (file)
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -720,6 +720,7 @@ struct genl_family dp_meter_genl_family __ro_after_init = {
        .parallel_ops = true,
        .small_ops = dp_meter_genl_ops,
        .n_small_ops = ARRAY_SIZE(dp_meter_genl_ops),
+       .resv_start_op = OVS_METER_CMD_GET + 1,
        .mcgrps = &ovs_meter_multicast_group,
        .n_mcgrps = 1,
        .module = THIS_MODULE,

diff --git a/net/psample/psample.c b/net/psample/psample.c
index 118d5d2a81a02308cd15a58fcc426954f111be22..81a794e36f535864869812c2003ff65d4c96efd0 100644 (file)
--- a/net/psample/psample.c
+++ b/net/psample/psample.c
@@ -115,6 +115,7 @@ static struct genl_family psample_nl_family __ro_after_init = {
        .mcgrps         = psample_nl_mcgrps,
        .small_ops      = psample_nl_ops,
        .n_small_ops    = ARRAY_SIZE(psample_nl_ops),
+       .resv_start_op  = PSAMPLE_CMD_GET_GROUP + 1,
        .n_mcgrps       = ARRAY_SIZE(psample_nl_mcgrps),
 };
 

diff --git a/net/smc/smc_netlink.c b/net/smc/smc_netlink.c
index c5a62f6f52ba5fc092072899916c0d30971d6d26..621c46c700739df1e6db3f13d089f6f57977a11b 100644 (file)
--- a/net/smc/smc_netlink.c
+++ b/net/smc/smc_netlink.c
@@ -142,7 +142,8 @@ struct genl_family smc_gen_nl_family __ro_after_init = {
        .netnsok =      true,
        .module =       THIS_MODULE,
        .ops =          smc_gen_nl_ops,
-       .n_ops =        ARRAY_SIZE(smc_gen_nl_ops)
+       .n_ops =        ARRAY_SIZE(smc_gen_nl_ops),
+       .resv_start_op = SMC_NETLINK_DISABLE_HS_LIMITATION + 1,
 };
 
 int __init smc_nl_init(void)

diff --git a/net/smc/smc_pnet.c b/net/smc/smc_pnet.c
index 4c3bf6db7038e8f71bec760c119c0ac7cd0c7eec..25fb2fd186e22f5132a1c67d2ac3d8c5658a9fe2 100644 (file)
--- a/net/smc/smc_pnet.c
+++ b/net/smc/smc_pnet.c
@@ -715,7 +715,8 @@ static struct genl_family smc_pnet_nl_family __ro_after_init = {
        .netnsok = true,
        .module = THIS_MODULE,
        .ops = smc_pnet_ops,
-       .n_ops =  ARRAY_SIZE(smc_pnet_ops)
+       .n_ops =  ARRAY_SIZE(smc_pnet_ops),
+       .resv_start_op = SMC_PNETID_FLUSH + 1,
 };
 
 bool smc_pnet_is_ndev_pnetid(struct net *net, u8 *pnetid)

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index c447cb5f879e70bbce4feca8822292f2600e648b..e8fd257c0e6888b18164f4a63a68ad358ed0459e 100644 (file)
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -294,6 +294,7 @@ struct genl_family tipc_genl_family __ro_after_init = {
        .module         = THIS_MODULE,
        .ops            = tipc_genl_v2_ops,
        .n_ops          = ARRAY_SIZE(tipc_genl_v2_ops),
+       .resv_start_op  = TIPC_NL_ADDR_LEGACY_GET + 1,
 };
 
 int __init tipc_netlink_start(void)

diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c
index 0749df80454d4fb8075abc0020584b7f5d1a4662..fc68733673ba6ddca574f67253ede5e340235104 100644 (file)
--- a/net/tipc/netlink_compat.c
+++ b/net/tipc/netlink_compat.c
@@ -1357,6 +1357,7 @@ static struct genl_family tipc_genl_compat_family __ro_after_init = {
        .module         = THIS_MODULE,
        .small_ops      = tipc_genl_compat_ops,
        .n_small_ops    = ARRAY_SIZE(tipc_genl_compat_ops),
+       .resv_start_op  = TIPC_GENL_CMD + 1,
 };
 
 int __init tipc_netlink_compat_start(void)

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index dad88d231d56037ff8a956a8d342fe8cbfaaf136..e0087176796cbe3b2b46e6cfb450994080a13996 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -17237,6 +17237,7 @@ static struct genl_family nl80211_fam __ro_after_init = {
        .n_ops = ARRAY_SIZE(nl80211_ops),
        .small_ops = nl80211_small_ops,
        .n_small_ops = ARRAY_SIZE(nl80211_small_ops),
+       .resv_start_op = NL80211_CMD_REMOVE_LINK_STA + 1,
        .mcgrps = nl80211_mcgrps,
        .n_mcgrps = ARRAY_SIZE(nl80211_mcgrps),
        .parallel_ops = true,