sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-05 12:22:11 +03:00
Code Activity

s3:unix_msg: rename a variable buflen->data_len in queue_msg()

Browse Source 
Pair-Programmed-With: Volker Lendecke <vl@samba.org>
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Michael Adam <obnox@samba.org>
Signed-off-by: Volker Lendecke <vl@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Michael Adam
2014-09-29 11:39:24 +02:00
parent 2564a5fa57
commit e38f4f4ceb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source3/lib/unix_msg/unix_msg.c
View File

@ -449,7 +449,7 @@ static int queue_msg(struct unix_dgram_send_queue *q,
const int *fds, size_t num_fds) const int *fds, size_t num_fds)
{ {
struct unix_dgram_msg *msg; struct unix_dgram_msg *msg;
ssize_t buflen; ssize_t data_len;
uint8_t *data_buf; uint8_t *data_buf;
size_t msglen; size_t msglen;
size_t fds_size = sizeof(int) * num_fds; size_t fds_size = sizeof(int) * num_fds;
@ -475,14 +475,14 @@ static int queue_msg(struct unix_dgram_send_queue *q,
} }
} }
buflen = iov_buflen(iov, iovlen); data_len = iov_buflen(iov, iovlen);
if (buflen == -1) { if (data_len == -1) {
goto invalid; goto invalid;
} }
msglen = offsetof(struct unix_dgram_msg, buf); msglen = offsetof(struct unix_dgram_msg, buf);
tmp = msglen + buflen; tmp = msglen + data_len;
if ((tmp < msglen) || (tmp < buflen)) { if ((tmp < msglen) || (tmp < data_len)) {
/* overflow */ /* overflow */
goto invalid; goto invalid;
} }
@ -514,7 +514,7 @@ static int queue_msg(struct unix_dgram_send_queue *q,
ret = ENOMEM; ret = ENOMEM;
goto fail; goto fail;
} }
msg->buflen = buflen; msg->buflen = data_len;
msg->sock = q->sock; msg->sock = q->sock;
data_buf = msg->buf; data_buf = msg->buf;