fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 02:50:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

netlink: track ucred via a boolean field in struct nl_msg

Browse source 
Also, accept NULL in nlmsg_set_creds() to clear the set credentials.
This commit is contained in:
Thomas Haller 2018-12-23 14:25:56 +01:00
parent fce3243f12
commit e5fb1dd6e7
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/platform/nm-linux-platform.c
View file

@ -7422,8 +7422,7 @@ continue_reading:
_LOGt ("netlink: recvmsg: new message %s",
nl_nlmsghdr_to_str (hdr, buf_nlmsghdr, sizeof (buf_nlmsghdr)));
if (creds)
nlmsg_set_creds (msg, creds);
nlmsg_set_creds (msg, creds);
if (hdr->nlmsg_flags & NLM_F_MULTI)
multipart = TRUE;

16
src/platform/nm-netlink.c
View file

@ -44,16 +44,14 @@
#define NETLINK_EXT_ACK 11
#endif
#define NL_MSG_CRED_PRESENT 1
struct nl_msg {
int nm_protocol;
int nm_flags;
struct sockaddr_nl nm_src;
struct sockaddr_nl nm_dst;
struct ucred nm_creds;
struct nlmsghdr * nm_nlh;
size_t nm_size;
bool nm_creds_has:1;
};
struct nl_sock {
@ -610,7 +608,7 @@ nlmsg_set_src (struct nl_msg *msg, struct sockaddr_nl *addr)
struct ucred *
nlmsg_get_creds (struct nl_msg *msg)
{
if (msg->nm_flags & NL_MSG_CRED_PRESENT)
if (msg->nm_creds_has)
return &msg->nm_creds;
return NULL;
}
@ -618,8 +616,11 @@ nlmsg_get_creds (struct nl_msg *msg)
void
nlmsg_set_creds (struct nl_msg *msg, struct ucred *creds)
{
memcpy (&msg->nm_creds, creds, sizeof (*creds));
msg->nm_flags |= NL_MSG_CRED_PRESENT;
if (creds) {
memcpy (&msg->nm_creds, creds, sizeof (*creds));
msg->nm_creds_has = TRUE;
} else
msg->nm_creds_has = FALSE;
}
/*****************************************************************************/
@ -1098,8 +1099,7 @@ continue_reading:
nlmsg_set_proto (msg, sk->s_proto);
nlmsg_set_src (msg, &nla);
if (creds)
nlmsg_set_creds (msg, creds);
nlmsg_set_creds (msg, creds);
nrecv++;