Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP4:GA
grub2.16098
0002-safemath-Add-some-arithmetic-primitives-th...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0002-safemath-Add-some-arithmetic-primitives-that-check-f.patch of Package grub2.16098
From de1c315841aa6f37357c72e196810484013291d6 Mon Sep 17 00:00:00 2001 From: Peter Jones <pjones@redhat.com> Date: Mon, 15 Jun 2020 10:58:42 -0400 Subject: [PATCH 2/7] safemath: Add some arithmetic primitives that check for overflow This adds a new header, include/grub/safemath.h, that includes easy to use wrappers for __builtin_{add,sub,mul}_overflow() declared like: bool OP(a, b, res) where OP is grub_add, grub_sub or grub_mul. OP() returns true in the case where the operation would overflow and res is not modified. Otherwise, false is returned and the operation is executed. These arithmetic primitives require newer compiler versions. So, bump these requirements in the INSTALL file too. Signed-off-by: Peter Jones <pjones@redhat.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> --- INSTALL | 22 ++-------------------- include/grub/compiler.h | 8 ++++++++ include/grub/safemath.h | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 20 deletions(-) create mode 100644 include/grub/safemath.h Index: grub-2.02~beta2/INSTALL =================================================================== --- grub-2.02~beta2.orig/INSTALL +++ grub-2.02~beta2/INSTALL @@ -11,24 +11,7 @@ GRUB depends on some software packages i you don't have any of them, please obtain and install them before configuring the GRUB. -* GCC 4.1.3 or later - Note: older versions may work but support is limited - Note: clang 3.2 or later works for i386 and x86_64 targets but results in - much bigger binaries. - earlier versions not tested - Note: clang 3.2 or later works for arm - None of tested clang versions generated usable thumb code - earlier versions not tested - Note: clang 3.3 or later works for arm64 - earlier versions have no arm64 support - Note: clang 3.3 or later works for mips(el) - earlier versions fail to generate .reginfo and hence gprel relocations - fail. - Note: clang 3.2 or later works for powerpc - earlier versions not tested - Note: clang doesn't support -mno-app-regs and so can't be used for sparc64 - Note: clang has no support for ia64 and hence you can't compile GRUB - for ia64 with clang +* GCC 5.1.0 or later * GNU Make * GNU Bison 2.3 or later * GNU gettext 0.17 or later Index: grub-2.02~beta2/include/grub/compiler.h =================================================================== --- grub-2.02~beta2.orig/include/grub/compiler.h +++ grub-2.02~beta2/include/grub/compiler.h @@ -109,4 +109,12 @@ void EXPORT_FUNC (_savegpr_31) (void); #endif +#if defined(__clang__) && defined(__clang_major__) && defined(__clang_minor__) +# define CLANG_PREREQ(maj,min) \ + ((__clang_major__ > (maj)) || \ + (__clang_major__ == (maj) && __clang_minor__ >= (min))) +#else +# define CLANG_PREREQ(maj,min) 0 +#endif + #endif /* ! GRUB_COMPILER_HEADER */ Index: grub-2.02~beta2/include/grub/safemath.h =================================================================== --- /dev/null +++ grub-2.02~beta2/include/grub/safemath.h @@ -0,0 +1,37 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2020 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see <http://www.gnu.org/licenses/>. + * + * Arithmetic operations that protect against overflow. + */ + +#ifndef GRUB_SAFEMATH_H +#define GRUB_SAFEMATH_H 1 + +#include <grub/compiler.h> + +/* These appear in gcc 5.1 and clang 3.8. */ +#if GNUC_PREREQ(5, 1) || CLANG_PREREQ(3, 8) + +#define grub_add(a, b, res) __builtin_add_overflow(a, b, res) +#define grub_sub(a, b, res) __builtin_sub_overflow(a, b, res) +#define grub_mul(a, b, res) __builtin_mul_overflow(a, b, res) + +#else +#error gcc 5.1 or newer or clang 3.8 or newer is required +#endif + +#endif /* GRUB_SAFEMATH_H */
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor