Thu Jan 20 02:58:17 2011 UTC ()
Use the _sys alias instead of the _ alias as the way to access the baseline
syscall.


(christos)
diff -r1.5 -r1.6 src/include/ssp/ssp.h
cvs diff -r1.5 -r1.6 src/include/ssp/ssp.h (switch to unified diff)

--- src/include/ssp/ssp.h 2011/01/19 19:21:29 1.5
+++ src/include/ssp/ssp.h 2011/01/20 02:58:17 1.6
@@ -1,71 +1,76 @@ @@ -1,71 +1,76 @@
1/* $NetBSD: ssp.h,v 1.5 2011/01/19 19:21:29 christos Exp $ */ 1/* $NetBSD: ssp.h,v 1.6 2011/01/20 02:58:17 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2006 The NetBSD Foundation, Inc. 4 * Copyright (c) 2006 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Christos Zoulas. 8 * by Christos Zoulas.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in the 16 * notice, this list of conditions and the following disclaimer in the
17 * documentation and/or other materials provided with the distribution. 17 * documentation and/or other materials provided with the distribution.
18 * 18 *
19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS 19 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31#ifndef _SSP_SSP_H_ 31#ifndef _SSP_SSP_H_
32#define _SSP_SSP_H_ 32#define _SSP_SSP_H_
33 33
34#include <sys/cdefs.h> 34#include <sys/cdefs.h>
35 35
36#if !defined(__cplusplus) 36#if !defined(__cplusplus)
37# if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 && __GNUC_PREREQ__(4, 1) 37# if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 && __GNUC_PREREQ__(4, 1)
38# if _FORTIFY_SOURCE > 1 38# if _FORTIFY_SOURCE > 1
39# define __SSP_FORTIFY_LEVEL 2 39# define __SSP_FORTIFY_LEVEL 2
40# else 40# else
41# define __SSP_FORTIFY_LEVEL 1 41# define __SSP_FORTIFY_LEVEL 1
42# endif 42# endif
43# endif 43# endif
44#endif 44#endif
45 45
46#define __ssp_weak_name(fun) _ ## fun 46#ifdef _NAMESPACE_H_
 47#define __ssp_weak_name(fun) _sys ## fun
 48#else
 49#define __ssp_weak_name(fun) _sys_ ## fun
 50#endif
 51
47#define __ssp_inline static __inline __attribute__((__always_inline__)) 52#define __ssp_inline static __inline __attribute__((__always_inline__))
48 53
49#define __ssp_bos(ptr) __builtin_object_size(ptr, __SSP_FORTIFY_LEVEL > 1) 54#define __ssp_bos(ptr) __builtin_object_size(ptr, __SSP_FORTIFY_LEVEL > 1)
50#define __ssp_bos0(ptr) __builtin_object_size(ptr, 0) 55#define __ssp_bos0(ptr) __builtin_object_size(ptr, 0)
51 56
52#define __ssp_redirect_raw(rtype, fun, args, call, bos) \ 57#define __ssp_redirect_raw(rtype, fun, args, call, bos) \
53rtype __ssp_weak_name(fun) args; \ 58rtype __ssp_weak_name(fun) args; \
54__ssp_inline rtype fun args; \ 59__ssp_inline rtype fun args; \
55__ssp_inline rtype fun args { \ 60__ssp_inline rtype fun args { \
56 if (bos(__buf) != (size_t)-1 && __len > bos(__buf)) \ 61 if (bos(__buf) != (size_t)-1 && __len > bos(__buf)) \
57 __chk_fail(); \ 62 __chk_fail(); \
58 return __ssp_weak_name(fun) call; \ 63 return __ssp_weak_name(fun) call; \
59} 64}
60 65
61#define __ssp_redirect(rtype, fun, args, call) \ 66#define __ssp_redirect(rtype, fun, args, call) \
62 __ssp_redirect_raw(rtype, fun, args, call, __ssp_bos) 67 __ssp_redirect_raw(rtype, fun, args, call, __ssp_bos)
63#define __ssp_redirect0(rtype, fun, args, call) \ 68#define __ssp_redirect0(rtype, fun, args, call) \
64 __ssp_redirect_raw(rtype, fun, args, call, __ssp_bos0) 69 __ssp_redirect_raw(rtype, fun, args, call, __ssp_bos0)
65 70
66__BEGIN_DECLS 71__BEGIN_DECLS
67void __stack_chk_fail(void) __dead; 72void __stack_chk_fail(void) __dead;
68void __chk_fail(void) __dead; 73void __chk_fail(void) __dead;
69__END_DECLS 74__END_DECLS
70 75
71#endif /* _SSP_SSP_H_ */ 76#endif /* _SSP_SSP_H_ */