drbd: Also need to check for DRBD_GENLA_F_MANDATORY flags before nla_find_nested()

This is done by introducing drbd_nla_find_nested() which handles the flag
before calling nla_find_nested().

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

2 files changed, 1 insertions, 38 deletions

diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index 47ef324b69db..0c2102c05384 100644
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
@@ -96,7 +96,7 @@ GENL_struct(DRBD_NLA_CFG_REPLY, 1, drbd_cfg_reply,
  * and the volume id within the resource. */
 GENL_struct(DRBD_NLA_CFG_CONTEXT, 2, drbd_cfg_context,
         __u32_field(1, DRBD_GENLA_F_MANDATORY,  ctx_volume)
-        __str_field(2, DRBD_GENLA_F_MANDATORY,  ctx_conn_name, 128)
+        __str_field(2, DRBD_GENLA_F_MANDATORY,  ctx_resource_name, 128)
 )
 
 GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf,
diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
index 357f2ad403b1..0b8a88e2e83e 100644
--- a/include/linux/genl_magic_func.h
+++ b/include/linux/genl_magic_func.h
@@ -142,43 +142,6 @@ static struct nlattr *nested_attr_tb[128];
 #define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); }))
 #endif
 
-static inline int drbd_nla_check_mandatory(int maxtype, struct nlattr *nla)
-{
-        struct nlattr *head = nla_data(nla);
-        int len = nla_len(nla);
-        int rem;
-
-        /*
-         * validate_nla (called from nla_parse_nested) ignores attributes
-         * beyond maxtype, and does not understand the DRBD_GENLA_F_MANDATORY flag.
-         * In order to have it validate attributes with the DRBD_GENLA_F_MANDATORY
-         * flag set also, check and remove that flag before calling
-         * nla_parse_nested.
-         */
-
-        nla_for_each_attr(nla, head, len, rem) {
-                if (nla->nla_type & DRBD_GENLA_F_MANDATORY) {
-                        nla->nla_type &= ~DRBD_GENLA_F_MANDATORY;
-                        if (nla_type(nla) > maxtype)
-                                return -EOPNOTSUPP;
-                }
-        }
-        return 0;
-}
-
-static inline int drbd_nla_parse_nested(struct nlattr *tb[], int maxtype,
-                                        struct nlattr *nla,
-                                        const struct nla_policy *policy)
-{
-        int err;
-
-        err = drbd_nla_check_mandatory(maxtype, nla);
-        if (!err)
-                err = nla_parse_nested(tb, maxtype, nla, policy);
-
-        return err;
-}
-
 #undef GENL_struct
 #define GENL_struct(tag_name, tag_number, s_name, s_fields)             \
 /* *_from_attrs functions are static, but potentially unused */         \