diff mbox series

[2/3] net/mlx5: add Netlink message size check in rule cleanup

Message ID 1541843951-31708-3-git-send-email-viacheslavo@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Shahaf Shuler
Headers show
Series fix VXLAN related rules cleanup and management | expand

Checks

Context Check Description
ci/Intel-compilation success Compilation OK

Commit Message

Slava Ovsiienko Nov. 10, 2018, 9:59 a.m. UTC
This patch is preparation for the following fix, we are going to send
Netlink message from buffer in one-by-one fashion. It is highly
desirable to check multimessage buffer consistency for debug purposes.

Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_tcf.c | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

Comments

Yongseok Koh Nov. 11, 2018, 11:39 a.m. UTC | #1
> On Nov 10, 2018, at 1:59 AM, Slava Ovsiienko <viacheslavo@mellanox.com> wrote:
> 
> This patch is preparation for the following fix, we are going to send
> Netlink message from buffer in one-by-one fashion. It is highly
> desirable to check multimessage buffer consistency for debug purposes.
> 
> Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> ---

Acked-by: Yongseok Koh <yskoh@mellanox.com>
 
Thanks

> drivers/net/mlx5/mlx5_flow_tcf.c | 33 ++++++++++++++++++++-------------
> 1 file changed, 20 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c
> index ba0674a..bba8aed 100644
> --- a/drivers/net/mlx5/mlx5_flow_tcf.c
> +++ b/drivers/net/mlx5/mlx5_flow_tcf.c
> @@ -3935,6 +3935,7 @@ struct tcf_nlcb_context {
> 	struct nlattr *na_local = NULL;
> 	struct nlattr *na_peer = NULL;
> 	unsigned char family;
> +	uint32_t size;
> 
> 	if (nlh->nlmsg_type != RTM_NEWADDR) {
> 		rte_errno = EINVAL;
> @@ -3962,11 +3963,11 @@ struct tcf_nlcb_context {
> 	if (!na_local || !na_peer)
> 		return 1;
> 	/* Local rule found with scope link, permanent and assigned peer. */
> -	cmd = flow_tcf_alloc_nlcmd(ctx, MNL_ALIGN(sizeof(struct nlmsghdr)) +
> -					MNL_ALIGN(sizeof(struct ifaddrmsg)) +
> -					(family == AF_INET6
> -					? 2 * SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN)
> -					: 2 * SZ_NLATTR_TYPE_OF(uint32_t)));
> +	size = MNL_ALIGN(sizeof(struct nlmsghdr)) +
> +	       MNL_ALIGN(sizeof(struct ifaddrmsg)) +
> +	       (family == AF_INET6 ? 2 * SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN)
> +				   : 2 * SZ_NLATTR_TYPE_OF(uint32_t));
> +	cmd = flow_tcf_alloc_nlcmd(ctx, size);
> 	if (!cmd) {
> 		rte_errno = ENOMEM;
> 		return -rte_errno;
> @@ -3991,6 +3992,7 @@ struct tcf_nlcb_context {
> 		mnl_attr_put(cmd, IFA_ADDRESS, IPV6_ADDR_LEN,
> 			mnl_attr_get_payload(na_peer));
> 	}
> +	assert(size == cmd->nlmsg_len);
> 	return 1;
> }
> 
> @@ -4059,6 +4061,7 @@ struct tcf_nlcb_context {
> 	struct nlattr *na_ip = NULL;
> 	struct nlattr *na_mac = NULL;
> 	unsigned char family;
> +	uint32_t size;
> 
> 	if (nlh->nlmsg_type != RTM_NEWNEIGH) {
> 		rte_errno = EINVAL;
> @@ -4085,12 +4088,12 @@ struct tcf_nlcb_context {
> 	if (!na_mac || !na_ip)
> 		return 1;
> 	/* Neigh rule with permenent attribute found. */
> -	cmd = flow_tcf_alloc_nlcmd(ctx, MNL_ALIGN(sizeof(struct nlmsghdr)) +
> -					MNL_ALIGN(sizeof(struct ndmsg)) +
> -					SZ_NLATTR_DATA_OF(ETHER_ADDR_LEN) +
> -					(family == AF_INET6
> -					? SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN)
> -					: SZ_NLATTR_TYPE_OF(uint32_t)));
> +	size = MNL_ALIGN(sizeof(struct nlmsghdr)) +
> +	       MNL_ALIGN(sizeof(struct ndmsg)) +
> +	       SZ_NLATTR_DATA_OF(ETHER_ADDR_LEN) +
> +	       (family == AF_INET6 ? SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN)
> +				   : SZ_NLATTR_TYPE_OF(uint32_t));
> +	cmd = flow_tcf_alloc_nlcmd(ctx, size);
> 	if (!cmd) {
> 		rte_errno = ENOMEM;
> 		return -rte_errno;
> @@ -4113,6 +4116,7 @@ struct tcf_nlcb_context {
> 	}
> 	mnl_attr_put(cmd, NDA_LLADDR, ETHER_ADDR_LEN,
> 		     mnl_attr_get_payload(na_mac));
> +	assert(size == cmd->nlmsg_len);
> 	return 1;
> }
> 
> @@ -4179,6 +4183,7 @@ struct tcf_nlcb_context {
> 	struct nlattr *na_vxlan = NULL;
> 	bool found = false;
> 	unsigned int vxindex;
> +	uint32_t size;
> 
> 	if (nlh->nlmsg_type != RTM_NEWLINK) {
> 		rte_errno = EINVAL;
> @@ -4224,8 +4229,9 @@ struct tcf_nlcb_context {
> 		return 1;
> 	/* Attached VXLAN device found, store the command to delete. */
> 	vxindex = ifm->ifi_index;
> -	cmd = flow_tcf_alloc_nlcmd(ctx, MNL_ALIGN(sizeof(struct nlmsghdr)) +
> -					MNL_ALIGN(sizeof(struct ifinfomsg)));
> +	size = MNL_ALIGN(sizeof(struct nlmsghdr)) +
> +	       MNL_ALIGN(sizeof(struct ifinfomsg));
> +	cmd = flow_tcf_alloc_nlcmd(ctx, size);
> 	if (!cmd) {
> 		rte_errno = ENOMEM;
> 		return -rte_errno;
> @@ -4236,6 +4242,7 @@ struct tcf_nlcb_context {
> 	ifm = mnl_nlmsg_put_extra_header(cmd, sizeof(*ifm));
> 	ifm->ifi_family = AF_UNSPEC;
> 	ifm->ifi_index = vxindex;
> +	assert(size == cmd->nlmsg_len);
> 	return 1;
> }
> 
> -- 
> 1.8.3.1
>
diff mbox series

Patch

diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c
index ba0674a..bba8aed 100644
--- a/drivers/net/mlx5/mlx5_flow_tcf.c
+++ b/drivers/net/mlx5/mlx5_flow_tcf.c
@@ -3935,6 +3935,7 @@  struct tcf_nlcb_context {
 	struct nlattr *na_local = NULL;
 	struct nlattr *na_peer = NULL;
 	unsigned char family;
+	uint32_t size;
 
 	if (nlh->nlmsg_type != RTM_NEWADDR) {
 		rte_errno = EINVAL;
@@ -3962,11 +3963,11 @@  struct tcf_nlcb_context {
 	if (!na_local || !na_peer)
 		return 1;
 	/* Local rule found with scope link, permanent and assigned peer. */
-	cmd = flow_tcf_alloc_nlcmd(ctx, MNL_ALIGN(sizeof(struct nlmsghdr)) +
-					MNL_ALIGN(sizeof(struct ifaddrmsg)) +
-					(family == AF_INET6
-					? 2 * SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN)
-					: 2 * SZ_NLATTR_TYPE_OF(uint32_t)));
+	size = MNL_ALIGN(sizeof(struct nlmsghdr)) +
+	       MNL_ALIGN(sizeof(struct ifaddrmsg)) +
+	       (family == AF_INET6 ? 2 * SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN)
+				   : 2 * SZ_NLATTR_TYPE_OF(uint32_t));
+	cmd = flow_tcf_alloc_nlcmd(ctx, size);
 	if (!cmd) {
 		rte_errno = ENOMEM;
 		return -rte_errno;
@@ -3991,6 +3992,7 @@  struct tcf_nlcb_context {
 		mnl_attr_put(cmd, IFA_ADDRESS, IPV6_ADDR_LEN,
 			mnl_attr_get_payload(na_peer));
 	}
+	assert(size == cmd->nlmsg_len);
 	return 1;
 }
 
@@ -4059,6 +4061,7 @@  struct tcf_nlcb_context {
 	struct nlattr *na_ip = NULL;
 	struct nlattr *na_mac = NULL;
 	unsigned char family;
+	uint32_t size;
 
 	if (nlh->nlmsg_type != RTM_NEWNEIGH) {
 		rte_errno = EINVAL;
@@ -4085,12 +4088,12 @@  struct tcf_nlcb_context {
 	if (!na_mac || !na_ip)
 		return 1;
 	/* Neigh rule with permenent attribute found. */
-	cmd = flow_tcf_alloc_nlcmd(ctx, MNL_ALIGN(sizeof(struct nlmsghdr)) +
-					MNL_ALIGN(sizeof(struct ndmsg)) +
-					SZ_NLATTR_DATA_OF(ETHER_ADDR_LEN) +
-					(family == AF_INET6
-					? SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN)
-					: SZ_NLATTR_TYPE_OF(uint32_t)));
+	size = MNL_ALIGN(sizeof(struct nlmsghdr)) +
+	       MNL_ALIGN(sizeof(struct ndmsg)) +
+	       SZ_NLATTR_DATA_OF(ETHER_ADDR_LEN) +
+	       (family == AF_INET6 ? SZ_NLATTR_DATA_OF(IPV6_ADDR_LEN)
+				   : SZ_NLATTR_TYPE_OF(uint32_t));
+	cmd = flow_tcf_alloc_nlcmd(ctx, size);
 	if (!cmd) {
 		rte_errno = ENOMEM;
 		return -rte_errno;
@@ -4113,6 +4116,7 @@  struct tcf_nlcb_context {
 	}
 	mnl_attr_put(cmd, NDA_LLADDR, ETHER_ADDR_LEN,
 		     mnl_attr_get_payload(na_mac));
+	assert(size == cmd->nlmsg_len);
 	return 1;
 }
 
@@ -4179,6 +4183,7 @@  struct tcf_nlcb_context {
 	struct nlattr *na_vxlan = NULL;
 	bool found = false;
 	unsigned int vxindex;
+	uint32_t size;
 
 	if (nlh->nlmsg_type != RTM_NEWLINK) {
 		rte_errno = EINVAL;
@@ -4224,8 +4229,9 @@  struct tcf_nlcb_context {
 		return 1;
 	/* Attached VXLAN device found, store the command to delete. */
 	vxindex = ifm->ifi_index;
-	cmd = flow_tcf_alloc_nlcmd(ctx, MNL_ALIGN(sizeof(struct nlmsghdr)) +
-					MNL_ALIGN(sizeof(struct ifinfomsg)));
+	size = MNL_ALIGN(sizeof(struct nlmsghdr)) +
+	       MNL_ALIGN(sizeof(struct ifinfomsg));
+	cmd = flow_tcf_alloc_nlcmd(ctx, size);
 	if (!cmd) {
 		rte_errno = ENOMEM;
 		return -rte_errno;
@@ -4236,6 +4242,7 @@  struct tcf_nlcb_context {
 	ifm = mnl_nlmsg_put_extra_header(cmd, sizeof(*ifm));
 	ifm->ifi_family = AF_UNSPEC;
 	ifm->ifi_index = vxindex;
+	assert(size == cmd->nlmsg_len);
 	return 1;
 }