All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] iproute2: Conforming to -D_FORTIFY_SOURCE=2 restrictions
@ 2011-10-17  7:35 Bin Li
  2011-10-17 15:23 ` Stephen Hemminger
  0 siblings, 1 reply; 5+ messages in thread
From: Bin Li @ 2011-10-17  7:35 UTC (permalink / raw)
  To: netdev

[-- Attachment #1: Type: text/plain, Size: 1902 bytes --]

Hi,

The issue is from below link.

https://bugzilla.novell.com/show_bug.cgi?id=719537

The issue is debug at below.

(gdb) bt
#0  0x00007ffff7697945 in raise (sig=<optimized out>)
    at ../nptl/sysdeps/unix/sysv/linux/raise.c:64
#1  0x00007ffff7698f21 in abort () at abort.c:92
#2  0x00007ffff76d48ef in __libc_message (do_abort=2,
    fmt=0x7ffff7789541 "*** %s ***: %s terminated\n")
    at ../sysdeps/unix/sysv/linux/libc_fatal.c:186
#3  0x00007ffff7750177 in __fortify_fail (
    msg=0x7ffff77894d8 "buffer overflow detected") at fortify_fail.c:32
#4  0x00007ffff774de10 in __chk_fail () at chk_fail.c:29
#5  0x00007ffff774cf8d in __strncpy_chk (
    s1=0x640c <Address 0x640c out of bounds>,
    s2=0x640c <Address 0x640c out of bounds>, n=6, s1len=18446744073709551615)
    at strncpy_chk.c:34
#6  0x000000000041e9c8 in strncpy (__len=<optimized out>,
    __src=<optimized out>, __dest=<optimized out>)
    at /usr/include/bits/string3.h:123
#7  xfrm_algo_parse (max=<optimized out>, buf=<optimized out>,
    key=<optimized out>, name=<optimized out>, type=<optimized out>,
    alg=<optimized out>) at xfrm_state.c:166

(gdb) l
161                     len = slen;
162                     if (len > 0) {
163                             if (len > max)
164                                     invarg("\"ALGOKEY\" makes buffer
overflow\n", key);
165
166                             strncpy(buf, key, len);
167                     }
168             }
169
170             alg->alg_key_len = len * 8;
(gdb) up
#8  xfrm_state_modify (cmd=<optimized out>, flags=<optimized out>, argc=1,
    argv=0x7fffffffe370) at xfrm_state.c:406
406                                     xfrm_algo_parse((void *)&alg, type,
name, key,

the compiler passes zero to __builtin___strncpy_chk as the buffer size.
xfrm_algo_parse is inlined into xfrm_state_modify.


Thanks!

Sincerely Yours,

Bin Li

http://zh.opensuse.org

[-- Attachment #2: iproute2-FORTIFY_SOURCE.patch --]
[-- Type: text/x-patch, Size: 2234 bytes --]

diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index a76be47..30a9aa3 100644
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -368,13 +368,16 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
 						struct xfrm_algo_auth auth;
 					} u;
 					char buf[XFRM_ALGO_KEY_BUF_SIZE];
-				} alg = {};
+				} *alg;
 				int len;
 				__u32 icvlen, trunclen;
 				char *name;
 				char *key;
 				char *buf;
 
+				alg = alloca (sizeof (*alg) + XFRM_ALGO_KEY_BUF_SIZE);
+				memset (alg, 0, sizeof (*alg) + XFRM_ALGO_KEY_BUF_SIZE);
+
 				switch (type) {
 				case XFRMA_ALG_AEAD:
 					if (aeadop)
@@ -412,8 +415,8 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
 				NEXT_ARG();
 				key = *argv;
 
-				buf = alg.u.alg.alg_key;
-				len = sizeof(alg.u.alg);
+				buf = alg->u.alg.alg_key;
+				len = sizeof(alg->u.alg);
 
 				switch (type) {
 				case XFRMA_ALG_AEAD:
@@ -423,10 +426,10 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
 					if (get_u32(&icvlen, *argv, 0))
 						invarg("\"aead\" ICV length is invalid",
 						       *argv);
-					alg.u.aead.alg_icv_len = icvlen;
+					alg->u.aead.alg_icv_len = icvlen;
 
-					buf = alg.u.aead.alg_key;
-					len = sizeof(alg.u.aead);
+					buf = alg->u.aead.alg_key;
+					len = sizeof(alg->u.aead);
 					break;
 				case XFRMA_ALG_AUTH_TRUNC:
 					if (!NEXT_ARG_OK())
@@ -435,19 +438,19 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
 					if (get_u32(&trunclen, *argv, 0))
 						invarg("\"auth\" trunc length is invalid",
 						       *argv);
-					alg.u.auth.alg_trunc_len = trunclen;
+					alg->u.auth.alg_trunc_len = trunclen;
 
-					buf = alg.u.auth.alg_key;
-					len = sizeof(alg.u.auth);
+					buf = alg->u.auth.alg_key;
+					len = sizeof(alg->u.auth);
 					break;
 				}
 
-				xfrm_algo_parse((void *)&alg, type, name, key,
-						buf, sizeof(alg.buf));
-				len += alg.u.alg.alg_key_len;
+				xfrm_algo_parse((void *)alg, type, name, key,
+						buf, sizeof(alg->buf));
+				len += alg->u.alg.alg_key_len;
 
 				addattr_l(&req.n, sizeof(req.buf), type,
-					  (void *)&alg, len);
+					  (void *)alg, len);
 				break;
 			}
 			default:

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-10-19 16:50 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-17  7:35 [PATCH] iproute2: Conforming to -D_FORTIFY_SOURCE=2 restrictions Bin Li
2011-10-17 15:23 ` Stephen Hemminger
2011-10-19  9:15   ` Bin Li
2011-10-19 11:30     ` Eric Dumazet
2011-10-19 16:50       ` Stephen Hemminger

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.