[SCM] Socket Wrapper Repository - branch master updated

Andreas Schneider asn at samba.org
Fri Jan 11 13:17:10 UTC 2019


The branch, master has been updated
       via  9413e43 swrap: Add an overflow check
      from  8ccac24 Bump version to 1.2.1

https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 9413e433ea83095735ddb8dd080bceecde8a9b57
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Dec 29 20:20:13 2018 +0100

    swrap: Add an overflow check
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 src/socket_wrapper.c | 5 +++++
 1 file changed, 5 insertions(+)


Changeset truncated at 500 lines:

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index df70df5..a0e1df0 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -4752,6 +4752,11 @@ static ssize_t swrap_sendmsg_before(int fd,
 		for (i = 0; i < (size_t)msg->msg_iovlen; i++) {
 			size_t nlen;
 			nlen = len + msg->msg_iov[i].iov_len;
+			if (nlen < len) {
+				/* overflow */
+				errno = EMSGSIZE;
+				goto out;
+			}
 			if (nlen > mtu) {
 				break;
 			}


-- 
Socket Wrapper Repository



More information about the samba-cvs mailing list