|
Message-ID: <CANiq72m7GEZS=Wkzg5KLkTnzW8vYz8X90OwVs4r5vcCCAp1-Pg@mail.gmail.com> Date: Fri, 16 Mar 2018 00:17:50 +0100 From: Miguel Ojeda <miguel.ojeda.sandonis@...il.com> To: Kees Cook <keescook@...omium.org> Cc: Linus Torvalds <torvalds@...ux-foundation.org>, Andrew Morton <akpm@...ux-foundation.org>, Josh Poimboeuf <jpoimboe@...hat.com>, Rasmus Villemoes <linux@...musvillemoes.dk>, Randy Dunlap <rdunlap@...radead.org>, Ingo Molnar <mingo@...nel.org>, David Laight <David.Laight@...lab.com>, Ian Abbott <abbotti@....co.uk>, linux-input <linux-input@...r.kernel.org>, linux-btrfs <linux-btrfs@...r.kernel.org>, Network Development <netdev@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Kernel Hardening <kernel-hardening@...ts.openwall.com> Subject: Re: [PATCH v4 1/2] kernel.h: Introduce const_max() for VLA removal On Fri, Mar 16, 2018 at 12:08 AM, Miguel Ojeda <miguel.ojeda.sandonis@...il.com> wrote: > On Thu, Mar 15, 2018 at 11:58 PM, Miguel Ojeda > <miguel.ojeda.sandonis@...il.com> wrote: >> On Thu, Mar 15, 2018 at 11:46 PM, Kees Cook <keescook@...omium.org> wrote: >>> >>> By using this eye-bleed: >>> >>> size_t __error_not_const_arg(void) \ >>> __compiletime_error("const_max() used with non-compile-time constant arg"); >>> size_t __error_not_positive_arg(void) \ >>> __compiletime_error("const_max() used with negative arg"); >>> #define const_max(x, y) \ >>> __builtin_choose_expr(__builtin_constant_p(x) && \ >>> __builtin_constant_p(y), \ >>> __builtin_choose_expr((x) >= 0 && (y) >= 0, \ >>> (typeof(x))(x) > (typeof(y))(y) ? \ >>> (x) : (y), \ >>> __error_not_positive_arg()), \ >>> __error_not_const_arg()) >>> >> >> I was writing it like this: >> >> #define const_max(a, b) \ >> ({ \ >> if ((a) < 0) \ >> __const_max_called_with_negative_value(); \ >> if ((b) < 0) \ >> __const_max_called_with_negative_value(); \ >> if (!__builtin_types_compatible_p(typeof(a), typeof(b))) \ >> __const_max_called_with_incompatible_types(); \ >> __builtin_choose_expr((a) > (b), (a), (b)); \ >> }) > > The full one, using your naming convention: > > #define const_max(x, y) \ > ({ \ > if (!__builtin_constant_p(x)) \ > __error_not_const_arg(); \ > if (!__builtin_constant_p(y)) \ > __error_not_const_arg(); \ > if (!__builtin_types_compatible_p(typeof(x), typeof(y))) \ > __error_incompatible_types(); \ > if ((x) < 0) \ > __error_not_positive_arg(); \ > if ((y) < 0) \ > __error_not_positive_arg(); \ > __builtin_choose_expr((x) > (y), (x), (y)); \ > }) > Nevermind... gcc doesn't take that as a constant expr, even if it compiles as one at -O0.
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.