mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

netlink: Sequence numbers are actually 32 bits wide

Browse source 
Harmless, as we use sequence numbers monotonically anyway, but now
clang-tidy reports:

/home/sbrivio/passt/netlink.c:155:7: error: format specifies type 'unsigned short' but the argument has type '__u32' (aka 'unsigned int') [clang-diagnostic-format,-warnings-as-errors]
                    nh->nlmsg_seq, seq);
                    ^
/home/sbrivio/passt/log.h:26:7: note: expanded from macro 'die'
                err(__VA_ARGS__);                                       \
                    ^~~~~~~~~~~
/home/sbrivio/passt/log.h:19:34: note: expanded from macro 'err'
                                        ^~~~~~~~~~~
Suppressed 222820 warnings (222816 in non-user code, 4 NOLINT).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
1 warning treated as error
make: *** [Makefile:255: clang-tidy] Error 1

Fixes: 9d4ab98d53 ("netlink: Add nl_do() helper for simple operations with error checking")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stefano Brivio 2023-11-07 11:13:05 +01:00
parent 53ff387156
commit b944622969
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
netlink.c
View file

@ -113,7 +113,7 @@ fail:
* *
* Return: sequence number of request on success, terminates on error * Return: sequence number of request on success, terminates on error
*/ */
static uint16_t nl_send(int s, void *req, uint16_t type, static uint32_t nl_send(int s, void *req, uint16_t type,
uint16_t flags, ssize_t len) uint16_t flags, ssize_t len)
{ {
struct nlmsghdr *nh; struct nlmsghdr *nh;
@ -146,12 +146,12 @@ static uint16_t nl_send(int s, void *req, uint16_t type,
* > 0 @n if there are more responses to request @seq * > 0 @n if there are more responses to request @seq
* terminates if sequence numbers are out of sync * terminates if sequence numbers are out of sync
*/ */
static int nl_status(const struct nlmsghdr *nh, ssize_t n, uint16_t seq) static int nl_status(const struct nlmsghdr *nh, ssize_t n, uint32_t seq)
{ {
ASSERT(NLMSG_OK(nh, n)); ASSERT(NLMSG_OK(nh, n));
if (nh->nlmsg_seq != seq) if (nh->nlmsg_seq != seq)
die("netlink: Unexpected sequence number (%hu != %hu)", die("netlink: Unexpected sequence number (%u != %u)",
nh->nlmsg_seq, seq); nh->nlmsg_seq, seq);
if (nh->nlmsg_type == NLMSG_DONE) { if (nh->nlmsg_type == NLMSG_DONE) {
@ -229,7 +229,7 @@ static int nl_do(int s, void *req, uint16_t type, uint16_t flags, ssize_t len)
struct nlmsghdr *nh; struct nlmsghdr *nh;
char buf[NLBUFSIZ]; char buf[NLBUFSIZ];
ssize_t status; ssize_t status;
uint16_t seq; uint32_t seq;
seq = nl_send(s, req, type, flags, len); seq = nl_send(s, req, type, flags, len);
nl_foreach(nh, status, s, buf, seq) nl_foreach(nh, status, s, buf, seq)
@ -259,7 +259,7 @@ unsigned int nl_get_ext_if(int s, sa_family_t af)
struct rtattr *rta; struct rtattr *rta;
char buf[NLBUFSIZ]; char buf[NLBUFSIZ];
ssize_t status; ssize_t status;
uint16_t seq; uint32_t seq;
size_t na; size_t na;
seq = nl_send(s, &req, RTM_GETROUTE, NLM_F_DUMP, sizeof(req)); seq = nl_send(s, &req, RTM_GETROUTE, NLM_F_DUMP, sizeof(req));
@ -313,7 +313,7 @@ int nl_route_get_def(int s, unsigned int ifi, sa_family_t af, void *gw)
bool found = false; bool found = false;
char buf[NLBUFSIZ]; char buf[NLBUFSIZ];
ssize_t status; ssize_t status;
uint16_t seq; uint32_t seq;
seq = nl_send(s, &req, RTM_GETROUTE, NLM_F_DUMP, sizeof(req)); seq = nl_send(s, &req, RTM_GETROUTE, NLM_F_DUMP, sizeof(req));
nl_foreach_oftype(nh, status, s, buf, seq, RTM_NEWROUTE) { nl_foreach_oftype(nh, status, s, buf, seq, RTM_NEWROUTE) {
@ -438,7 +438,7 @@ int nl_route_dup(int s_src, unsigned int ifi_src,
unsigned dup_routes = 0; unsigned dup_routes = 0;
struct nlmsghdr *nh; struct nlmsghdr *nh;
char buf[NLBUFSIZ]; char buf[NLBUFSIZ];
uint16_t seq; uint32_t seq;
unsigned i; unsigned i;
seq = nl_send(s_src, &req, RTM_GETROUTE, NLM_F_DUMP, sizeof(req)); seq = nl_send(s_src, &req, RTM_GETROUTE, NLM_F_DUMP, sizeof(req));
@ -550,7 +550,7 @@ int nl_addr_get(int s, unsigned int ifi, sa_family_t af,
struct nlmsghdr *nh; struct nlmsghdr *nh;
char buf[NLBUFSIZ]; char buf[NLBUFSIZ];
ssize_t status; ssize_t status;
uint16_t seq; uint32_t seq;
seq = nl_send(s, &req, RTM_GETADDR, NLM_F_DUMP, sizeof(req)); seq = nl_send(s, &req, RTM_GETADDR, NLM_F_DUMP, sizeof(req));
nl_foreach_oftype(nh, status, s, buf, seq, RTM_NEWADDR) { nl_foreach_oftype(nh, status, s, buf, seq, RTM_NEWADDR) {
@ -674,7 +674,7 @@ int nl_addr_dup(int s_src, unsigned int ifi_src,
char buf[NLBUFSIZ]; char buf[NLBUFSIZ];
struct nlmsghdr *nh; struct nlmsghdr *nh;
ssize_t status; ssize_t status;
uint16_t seq; uint32_t seq;
int rc = 0; int rc = 0;
seq = nl_send(s_src, &req, RTM_GETADDR, NLM_F_DUMP, sizeof(req)); seq = nl_send(s_src, &req, RTM_GETADDR, NLM_F_DUMP, sizeof(req));
@ -729,7 +729,7 @@ int nl_link_get_mac(int s, unsigned int ifi, void *mac)
struct nlmsghdr *nh; struct nlmsghdr *nh;
char buf[NLBUFSIZ]; char buf[NLBUFSIZ];
ssize_t status; ssize_t status;
uint16_t seq; uint32_t seq;
seq = nl_send(s, &req, RTM_GETLINK, 0, sizeof(req)); seq = nl_send(s, &req, RTM_GETLINK, 0, sizeof(req));
nl_foreach_oftype(nh, status, s, buf, seq, RTM_NEWLINK) { nl_foreach_oftype(nh, status, s, buf, seq, RTM_NEWLINK) {