matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

check return value of rtnl_send and related functions 

Use warn_unused_result to enforce checking return value of rtnl_send,
and fix where the errors are.

Suggested by initial patch from Petr Písař <ppisar@redhat.com>
This commit is contained in:
Stephen Hemminger 2013-12-20 08:15:02 -08:00
parent 4d98ab00de
commit d2468da0a3
5 changed files with 36 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/libnetlink.h
View File

@ -22,13 +22,22 @@ struct rtnl_handle
extern int rcvbuf; extern int rcvbuf;
extern int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions); extern int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
extern int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int protocol); __attribute__((warn_unused_result));
extern int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions,
int protocol)
__attribute__((warn_unused_result));
extern void rtnl_close(struct rtnl_handle *rth); extern void rtnl_close(struct rtnl_handle *rth);
extern int rtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type); extern int rtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type)
__attribute__((warn_unused_result));
extern int rtnl_wilddump_req_filter(struct rtnl_handle *rth, int fam, int type, extern int rtnl_wilddump_req_filter(struct rtnl_handle *rth, int fam, int type,
__u32 filt_mask); __u32 filt_mask)
extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len); __attribute__((warn_unused_result));
extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req,
int len)
__attribute__((warn_unused_result));
typedef int (*rtnl_filter_t)(const struct sockaddr_nl *, typedef int (*rtnl_filter_t)(const struct sockaddr_nl *,
struct nlmsghdr *n, void *); struct nlmsghdr *n, void *);
@ -44,9 +53,12 @@ extern int rtnl_dump_filter_l(struct rtnl_handle *rth,
extern int rtnl_dump_filter(struct rtnl_handle *rth, rtnl_filter_t filter, extern int rtnl_dump_filter(struct rtnl_handle *rth, rtnl_filter_t filter,
void *arg); void *arg);
extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
unsigned groups, struct nlmsghdr *answer); unsigned groups, struct nlmsghdr *answer)
extern int rtnl_send(struct rtnl_handle *rth, const void *buf, int); __attribute__((warn_unused_result));
extern int rtnl_send_check(struct rtnl_handle *rth, const void *buf, int); extern int rtnl_send(struct rtnl_handle *rth, const void *buf, int)
__attribute__((warn_unused_result));
extern int rtnl_send_check(struct rtnl_handle *rth, const void *buf, int)
__attribute__((warn_unused_result));
extern int addattr(struct nlmsghdr *n, int maxlen, int type); extern int addattr(struct nlmsghdr *n, int maxlen, int type);
extern int addattr8(struct nlmsghdr *n, int maxlen, int type, __u8 data); extern int addattr8(struct nlmsghdr *n, int maxlen, int type, __u8 data);

5
ip/iplink.c
View File

@ -178,7 +178,10 @@ static int iplink_have_newlink(void)
req.n.nlmsg_type = RTM_NEWLINK; req.n.nlmsg_type = RTM_NEWLINK;
req.i.ifi_family = AF_UNSPEC; req.i.ifi_family = AF_UNSPEC;
rtnl_send(&rth, &req.n, req.n.nlmsg_len); if (rtnl_send(&rth, &req.n, req.n.nlmsg_len) < 0) {
perror("request send failed");
exit(1);
}
rtnl_listen(&rth, accept_msg, NULL); rtnl_listen(&rth, accept_msg, NULL);
} }
return have_rtnl_newlink; return have_rtnl_newlink;

5
ip/ipnetconf.c
View File

@ -161,7 +161,10 @@ static int do_show(int argc, char **argv)
addattr_l(&req.n, sizeof(req), NETCONFA_IFINDEX, addattr_l(&req.n, sizeof(req), NETCONFA_IFINDEX,
&filter.ifindex, sizeof(filter.ifindex)); &filter.ifindex, sizeof(filter.ifindex));
rtnl_send(&rth, &req.n, req.n.nlmsg_len); if (rtnl_send(&rth, &req.n, req.n.nlmsg_len) < 0) {
perror("Can not send request");
exit(1);
}
rtnl_listen(&rth, print_netconf, stdout); rtnl_listen(&rth, print_netconf, stdout);
} else { } else {
dump: dump:

6
misc/arpd.c
View File

@ -428,7 +428,11 @@ static int do_one_request(struct nlmsghdr *n)
static void load_initial_table(void) static void load_initial_table(void)
{ {
rtnl_wilddump_request(&rth, AF_INET, RTM_GETNEIGH); if (rtnl_wilddump_request(&rth, AF_INET, RTM_GETNEIGH) < 0) {
perror("dump request failed");
exit(1);
}
} }
static void get_kern_msg(void) static void get_kern_msg(void)

4
misc/ss.c
View File

@ -996,7 +996,9 @@ static int xll_initted = 0;
static void xll_init(void) static void xll_init(void)
{ {
struct rtnl_handle rth; struct rtnl_handle rth;
rtnl_open(&rth, 0); if (rtnl_open(&rth, 0) < 0)
exit(1);
ll_init_map(&rth); ll_init_map(&rth);
rtnl_close(&rth); rtnl_close(&rth);
xll_initted = 1; xll_initted = 1;