stv0g/libnl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

nl_recv(): work with credentials only if "creds" given and NL_SOCK_PASSCRED set

Browse source
This commit is contained in:
Коренберг Марк (дома) 2012-10-19 23:23:10 +06:00
parent da694e6c7b
commit 420e4623fd
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/nl.c
View file

@ -407,7 +407,7 @@ errout:
* @arg sk Netlink socket. * @arg sk Netlink socket.
* @arg nla Destination pointer for peer's netlink address. (required) * @arg nla Destination pointer for peer's netlink address. (required)
* @arg buf Destination pointer for message content. (required) * @arg buf Destination pointer for message content. (required)
* @arg creds Destination pointer for credentials. * @arg creds Destination pointer for credentials. (optional)
* *
* Receives a netlink message, allocates a buffer in \c *buf and * Receives a netlink message, allocates a buffer in \c *buf and
* stores the message content. The peer's netlink address is stored * stores the message content. The peer's netlink address is stored
@ -451,7 +451,7 @@ int nl_recv(struct nl_sock *sk, struct sockaddr_nl *nla,
goto abort; goto abort;
} }
if (sk->s_flags & NL_SOCK_PASSCRED) { if (creds && (sk->s_flags & NL_SOCK_PASSCRED)) {
msg.msg_controllen = CMSG_SPACE(sizeof(struct ucred)); msg.msg_controllen = CMSG_SPACE(sizeof(struct ucred));
msg.msg_control = malloc(msg.msg_controllen); msg.msg_control = malloc(msg.msg_controllen);
if (!msg.msg_control) { if (!msg.msg_control) {
@ -519,17 +519,20 @@ retry:
goto abort; goto abort;
} }
if (creds && (sk->s_flags & NL_SOCK_PASSCRED)) {
struct cmsghdr *cmsg;
for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
if (cmsg->cmsg_level == SOL_SOCKET && if (cmsg->cmsg_level != SOL_SOCKET)
cmsg->cmsg_type == SCM_CREDENTIALS) { continue;
if (creds) { if (cmsg->cmsg_type != SCM_CREDENTIALS)
continue;
tmpcreds = malloc(sizeof(*tmpcreds)); tmpcreds = malloc(sizeof(*tmpcreds));
if (!tmpcreds) { if (!tmpcreds) {
retval = -NLE_NOMEM; retval = -NLE_NOMEM;
goto abort; goto abort;
} }
memcpy(tmpcreds, CMSG_DATA(cmsg), sizeof(*tmpcreds)); memcpy(tmpcreds, CMSG_DATA(cmsg), sizeof(*tmpcreds));
}
break; break;
} }
} }