packages: coovachilli/coovachilli-strncpy.patch (NEW) - better fix for buff...

pawelz pawelz at pld-linux.org
Thu Sep 30 13:40:16 CEST 2010


Author: pawelz                       Date: Thu Sep 30 11:40:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- better fix for buffer overflow problem (inspired by svn trunk)

---- Files affected:
packages/coovachilli:
   coovachilli-strncpy.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/coovachilli/coovachilli-strncpy.patch
diff -u /dev/null packages/coovachilli/coovachilli-strncpy.patch:1.1
--- /dev/null	Thu Sep 30 13:40:16 2010
+++ packages/coovachilli/coovachilli-strncpy.patch	Thu Sep 30 13:40:11 2010
@@ -0,0 +1,20 @@
+--- coova-chilli-1.2.4/src/chilli.c.orig	2010-08-24 13:29:08.000000000 +0200
++++ coova-chilli-1.2.4/src/chilli.c	2010-09-30 13:26:40.000000000 +0200
+@@ -966,8 +966,15 @@
+ 
+     strncpy(appconn->s_state.redir.username, mac, USERNAMESIZE);
+ 
+-    if (_options.macsuffix)
+-      strncat(appconn->s_state.redir.username, _options.macsuffix, USERNAMESIZE);
++    if (_options.macsuffix) {
++      size_t ulen = strlen(appconn->s_state.redir.username + ulen);
++      size_t size = USERNAMESIZE - ulen;
++
++      if (size) {
++        appconn->s_state.redir.username[--size + ulen] = '\0';
++        strncpy(appconn->s_state.redir.username + ulen, _options.macsuffix, size);
++      }
++    }
+   
+     username = appconn->s_state.redir.username;
+   } else {
================================================================


More information about the pld-cvs-commit mailing list