From d6a94e0bcdaef4b60d3c5f8e296154a7d0970c64 Mon Sep 17 00:00:00 2001 From: JingPiao Chen Date: Wed, 19 Jul 2017 22:55:53 +0800 Subject: [PATCH] netlink_sock_diag: replace NLA_ALIGN with NLMSG_ALIGN In several netlink_sock_diag parsers NLA_ALIGN was used instead of NLMSG_ALIGN to align the length of netlink messages. Fortunately, both macros round the given length to the closest multiple of 4, so technically there is no difference, but the use of wrong macro is misleading. * netlink_inet_diag.c (decode_inet_diag_req_compat, decode_inet_diag_req_v2, decode_inet_diag_msg): Replace NLA_ALIGN with NLMSG_ALIGN. * netlink_netlink_diag.c (decode_netlink_diag_msg): Likewise. * netlink_packet_diag.c (decode_packet_diag_msg): Likewise. * netlink_smc_diag.c (decode_smc_diag_msg): Likewise. --- netlink_inet_diag.c | 6 +++--- netlink_netlink_diag.c | 2 +- netlink_packet_diag.c | 2 +- netlink_smc_diag.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/netlink_inet_diag.c b/netlink_inet_diag.c index eb216f58..34fffc8a 100644 --- a/netlink_inet_diag.c +++ b/netlink_inet_diag.c @@ -255,7 +255,7 @@ decode_inet_diag_req_compat(struct tcb *const tcp, tprints("..."); tprints("}"); - offset = NLA_ALIGN(sizeof(req)); + offset = NLMSG_ALIGN(sizeof(req)); if (decode_nla && len > offset) { tprints(", "); decode_nlattr(tcp, addr + offset, len - offset, @@ -297,7 +297,7 @@ decode_inet_diag_req_v2(struct tcb *const tcp, tprints("..."); tprints("}"); - offset = NLA_ALIGN(sizeof(req)); + offset = NLMSG_ALIGN(sizeof(req)); if (decode_nla && len > offset) { tprints(", "); decode_nlattr(tcp, addr + offset, len - offset, @@ -456,7 +456,7 @@ DECL_NETLINK_DIAG_DECODER(decode_inet_diag_msg) tprints("..."); tprints("}"); - offset = NLA_ALIGN(sizeof(msg)); + offset = NLMSG_ALIGN(sizeof(msg)); if (decode_nla && len > offset) { tprints(", "); decode_nlattr(tcp, addr + offset, len - offset, diff --git a/netlink_netlink_diag.c b/netlink_netlink_diag.c index b17d44fc..65d41957 100644 --- a/netlink_netlink_diag.c +++ b/netlink_netlink_diag.c @@ -180,7 +180,7 @@ DECL_NETLINK_DIAG_DECODER(decode_netlink_diag_msg) tprints("..."); tprints("}"); - offset = NLA_ALIGN(sizeof(msg)); + offset = NLMSG_ALIGN(sizeof(msg)); if (decode_nla && len > offset) { tprints(", "); decode_nlattr(tcp, addr + offset, len - offset, diff --git a/netlink_packet_diag.c b/netlink_packet_diag.c index 94eff1df..8a69d4cc 100644 --- a/netlink_packet_diag.c +++ b/netlink_packet_diag.c @@ -199,7 +199,7 @@ DECL_NETLINK_DIAG_DECODER(decode_packet_diag_msg) tprints("..."); tprints("}"); - offset = NLA_ALIGN(sizeof(msg)); + offset = NLMSG_ALIGN(sizeof(msg)); if (decode_nla && len > offset) { tprints(", "); decode_nlattr(tcp, addr + offset, len - offset, diff --git a/netlink_smc_diag.c b/netlink_smc_diag.c index 2cd07ee0..53ae27ba 100644 --- a/netlink_smc_diag.c +++ b/netlink_smc_diag.c @@ -177,7 +177,7 @@ DECL_NETLINK_DIAG_DECODER(decode_smc_diag_msg) tprints("..."); tprints("}"); - offset = NLA_ALIGN(sizeof(msg)); + offset = NLMSG_ALIGN(sizeof(msg)); if (decode_nla && len > offset) { tprints(", "); decode_nlattr(tcp, addr + offset, len - offset,