lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tools: hv: use full nlmsghdr in netlink_send

Browse Source 
There is no need to have a nlmsghdr pointer to another temporary buffer.
Instead use a full struct nlmsghdr.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Olaf Hering
2013-08-07 15:45:12 +02:00
committed by Greg Kroah-Hartman
parent 2bc41ea3b3
commit b4fb0ca260
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/hv/hv_kvp_daemon.c
View File

@@ -1392,23 +1392,18 @@ kvp_get_domain_name(char *buffer, int length)
static int static int
netlink_send(int fd, struct cn_msg *msg) netlink_send(int fd, struct cn_msg *msg)
{ {
struct nlmsghdr *nlh; struct nlmsghdr nlh = { .nlmsg_type = NLMSG_DONE };
unsigned int size; unsigned int size;
struct msghdr message; struct msghdr message;
char buffer[64];
struct iovec iov[2]; struct iovec iov[2];
size = sizeof(struct cn_msg) + msg->len; size = sizeof(struct cn_msg) + msg->len;
nlh = (struct nlmsghdr *)buffer; nlh.nlmsg_pid = getpid();
nlh->nlmsg_seq = 0; nlh.nlmsg_len = NLMSG_LENGTH(size);
nlh->nlmsg_pid = getpid();
nlh->nlmsg_type = NLMSG_DONE;
nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));
nlh->nlmsg_flags = 0;
iov[0].iov_base = nlh; iov[0].iov_base = &nlh;
iov[0].iov_len = sizeof(*nlh); iov[0].iov_len = sizeof(nlh);
iov[1].iov_base = msg; iov[1].iov_base = msg;
iov[1].iov_len = size; iov[1].iov_len = size;

15
tools/hv/hv_vss_daemon.c
View File

@@ -105,23 +105,18 @@ static int vss_operate(int operation)
static int netlink_send(int fd, struct cn_msg *msg) static int netlink_send(int fd, struct cn_msg *msg)
{ {
struct nlmsghdr *nlh; struct nlmsghdr nlh = { .nlmsg_type = NLMSG_DONE };
unsigned int size; unsigned int size;
struct msghdr message; struct msghdr message;
char buffer[64];
struct iovec iov[2]; struct iovec iov[2];
size = sizeof(struct cn_msg) + msg->len; size = sizeof(struct cn_msg) + msg->len;
nlh = (struct nlmsghdr *)buffer; nlh.nlmsg_pid = getpid();
nlh->nlmsg_seq = 0; nlh.nlmsg_len = NLMSG_LENGTH(size);
nlh->nlmsg_pid = getpid();
nlh->nlmsg_type = NLMSG_DONE;
nlh->nlmsg_len = NLMSG_LENGTH(size - sizeof(*nlh));
nlh->nlmsg_flags = 0;
iov[0].iov_base = nlh; iov[0].iov_base = &nlh;
iov[0].iov_len = sizeof(*nlh); iov[0].iov_len = sizeof(nlh);
iov[1].iov_base = msg; iov[1].iov_base = msg;
iov[1].iov_len = size; iov[1].iov_len = size;