From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id B04293858D37; Tue, 14 Mar 2023 10:59:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B04293858D37 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678791575; bh=E+BskISx/Zv9paalVnkdphbPrRgagusa2ACfh2ql/zE=; h=From:To:Subject:Date:From; b=kBnc3JkmYOKXMIGR+pqblqA/fMo/zP68rvLNgXldDHA4fMrE5tg2GbwSYOVnBhhUz 65PzwJ67kkEJYq4hSLze1wZz1Qw6UIGNJQu1F5x1j734mIq9SJ0sp3csvHqgQVaVh3 xnypsFxunhzWFlqSl6sPzTEL76nk9dJgZaUg7+1I= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: Fix type mismatch on sys/cpuset.h X-Act-Checkin: newlib-cygwin X-Git-Author: Mark Geisert X-Git-Refname: refs/heads/cygwin-3_4-branch X-Git-Oldrev: 8d0b9ab672eccdb5421324435494e6f3cf7b3882 X-Git-Newrev: b086e626f3989fc6e7bcb7dae9c2315e5fbd99ec Message-Id: <20230314105935.B04293858D37@sourceware.org> Date: Tue, 14 Mar 2023 10:59:35 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3Db086e626f39= 89fc6e7bcb7dae9c2315e5fbd99ec commit b086e626f3989fc6e7bcb7dae9c2315e5fbd99ec Author: Mark Geisert AuthorDate: Tue Mar 14 01:56:01 2023 -0700 Commit: Corinna Vinschen CommitDate: Tue Mar 14 11:32:20 2023 +0100 Cygwin: Fix type mismatch on sys/cpuset.h =20 Addresses https://cygwin.com/pipermail/cygwin/2023-March/253220.html =20 Take the opportunity to follow FreeBSD's and Linux's lead in recasting macro inline code as calls to static inline functions. This allows the macros to be type-safe. In addition, added a lower bound check to the functions that use a cpu number to avoid a potential buffer underrun on a bad argument. h/t to Corinna for the advice on recasting. =20 Fixes: 362b98b49af5 ("Cygwin: Implement CPU_SET(3) macros") Diff: --- winsup/cygwin/include/sys/cpuset.h | 138 ++++++++++++++++++++++++++-------= ---- winsup/cygwin/release/3.4.7 | 5 ++ 2 files changed, 101 insertions(+), 42 deletions(-) diff --git a/winsup/cygwin/include/sys/cpuset.h b/winsup/cygwin/include/sys= /cpuset.h index 572565165185..d83359fdf352 100644 --- a/winsup/cygwin/include/sys/cpuset.h +++ b/winsup/cygwin/include/sys/cpuset.h @@ -31,50 +31,104 @@ int __sched_getaffinity_sys (pid_t, size_t, cpu_set_t = *); =20 /* These macros alloc or free dynamically-sized cpu sets of size 'num' cpu= s. Allocations are padded such that full-word operations can be done easil= y. */ -#define CPU_ALLOC_SIZE(num) ((num+__NCPUBITS-1) / __NCPUBITS) * sizeof (__= cpu_mask) -#define CPU_ALLOC(num) __builtin_malloc (CPU_ALLOC_SIZE(num)) -#define CPU_FREE(set) __builtin_free (set) +#define CPU_ALLOC_SIZE(num) __cpuset_alloc_size (num) +static inline size_t +__cpuset_alloc_size (int num) +{ + return (size_t) (((num + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_m= ask)); +} + +#define CPU_ALLOC(num) __cpuset_alloc (num) +static inline cpu_set_t * +__cpuset_alloc (int num) +{ + return (cpu_set_t *) __builtin_malloc (CPU_ALLOC_SIZE(num)); +} + +#define CPU_FREE(set) __cpuset_free (set) +static inline void +__cpuset_free (cpu_set_t *set) +{ + __builtin_free (set); +} =20 /* These _S macros operate on dynamically-sized cpu sets of size 'siz' byt= es */ -#define CPU_ZERO_S(siz, set) __builtin_memset (set, 0, siz) - -#define CPU_SET_S(cpu,siz,set) \ - if (cpu < 8 * siz) \ - (set)->__bits[__CPUELT(cpu)] |=3D __CPUMASK(cpu); - -#define CPU_CLR_S(cpu,siz,set) \ - if (cpu < 8 * siz) \ - (set)->__bits[__CPUELT(cpu)] &=3D ~(__CPUMASK(cpu)); - -#define CPU_ISSET_S(cpu,siz,set) \ - ({int res =3D 0; \ - if (cpu < 8 * siz) \ - res =3D !!((set)->__bits[__CPUELT(cpu)] & __CPUMASK(cpu)); \ - res;}) - -#define CPU_COUNT_S(siz, set) \ - ({int tot =3D 0;\ - for (int i =3D 0; i < siz / sizeof (__cpu_mask); i++) \ - tot +=3D __builtin_popcountl ((set)->__bits[i]); \ - tot;}) - -#define CPU_AND_S(siz, dst, src1, src2) \ - for (int i =3D 0; i < siz / sizeof (__cpu_mask); i++) \ - (dst)->__bits[i] =3D (src1)->__bits[i] & (src2)->__bits[i]; - -#define CPU_OR_S(siz, dst, src1, src2) \ - for (int i =3D 0; i < siz / sizeof (__cpu_mask); i++) \ - (dst)->__bits[i] =3D (src1)->__bits[i] | (src2)->__bits[i]; - -#define CPU_XOR_S(siz, dst, src1, src2) \ - for (int i =3D 0; i < siz / sizeof (__cpu_mask); i++) \ - (dst)->__bits[i] =3D (src1)->__bits[i] ^ (src2)->__bits[i]; - -#define CPU_EQUAL_S(siz, src1, src2) \ - ({int res =3D 1; \ - for (int i =3D 0; res && i < siz / sizeof (__cpu_mask); i++) \ - res &=3D (src1)->__bits[i] =3D=3D (src2)->__bits[i]; \ - res;}) +#define CPU_ZERO_S(siz, set) __cpuset_zero_s (siz, set) +static inline void +__cpuset_zero_s (size_t siz, cpu_set_t *set) +{ + (void) __builtin_memset (set, 0, siz); +} + +#define CPU_SET_S(cpu, siz, set) __cpuset_set_s (cpu, siz, set) +static inline void +__cpuset_set_s (int cpu, size_t siz, cpu_set_t *set) +{ + if (cpu >=3D 0 && cpu < 8 * siz) + (set)->__bits[__CPUELT(cpu)] |=3D __CPUMASK(cpu); +} + +#define CPU_CLR_S(cpu, siz, set) __cpuset_clr_s (cpu, siz, set) +static inline void +__cpuset_clr_s (int cpu, size_t siz, cpu_set_t *set) +{ + if (cpu >=3D 0 && cpu < 8 * siz) + (set)->__bits[__CPUELT(cpu)] &=3D ~(__CPUMASK(cpu)); +} + +#define CPU_ISSET_S(cpu, siz, set) __cpuset_isset_s (cpu, siz, set) +static inline int +__cpuset_isset_s (int cpu, size_t siz, cpu_set_t *set) +{ + int res =3D 0; + if (cpu >=3D 0 && cpu < 8 * siz) + res =3D !!((set)->__bits[__CPUELT(cpu)] & __CPUMASK(cpu)); + return res; +} + +#define CPU_COUNT_S(siz, set) __cpuset_count_s (siz, set) +static inline int +__cpuset_count_s (size_t siz, cpu_set_t *set) +{ + int res =3D 0; + for (int i =3D 0; i < siz / sizeof (__cpu_mask); i++) + res +=3D __builtin_popcountl ((set)->__bits[i]); + return res; +} + +#define CPU_AND_S(siz, dst, src1, src2) __cpuset_and_s (siz, dst, src1, sr= c2) +static inline void +__cpuset_and_s (size_t siz, cpu_set_t *dst, cpu_set_t *src1, cpu_set_t *sr= c2) +{ + for (int i =3D 0; i < siz / sizeof (__cpu_mask); i++) + (dst)->__bits[i] =3D (src1)->__bits[i] & (src2)->__bits[i]; +} + +#define CPU_OR_S(siz, dst, src1, src2) __cpuset_or_s (siz, dst, src1, src2) +static inline void +__cpuset_or_s (size_t siz, cpu_set_t *dst, cpu_set_t *src1, cpu_set_t *src= 2) +{ + for (int i =3D 0; i < siz / sizeof (__cpu_mask); i++) + (dst)->__bits[i] =3D (src1)->__bits[i] | (src2)->__bits[i]; +} + +#define CPU_XOR_S(siz, dst, src1, src2) __cpuset_xor_s (siz, dst, src1, sr= c2) +static inline void +__cpuset_xor_s (size_t siz, cpu_set_t *dst, cpu_set_t *src1, cpu_set_t *sr= c2) +{ + for (int i =3D 0; i < siz / sizeof (__cpu_mask); i++) + (dst)->__bits[i] =3D (src1)->__bits[i] ^ (src2)->__bits[i]; +} + +#define CPU_EQUAL_S(siz, src1, src2) __cpuset_equal_s (siz, src1, src2) +static inline int +__cpuset_equal_s (size_t siz, cpu_set_t *src1, cpu_set_t *src2) +{ + int res =3D 1; + for (int i =3D 0; res && i < siz / sizeof (__cpu_mask); i++) + res &=3D (src1)->__bits[i] =3D=3D (src2)->__bits[i]; + return res; +} =20 /* These macros operate on fixed-size cpu sets of size __CPU_SETSIZE cpus = */ #define CPU_ZERO(set) CPU_ZERO_S(sizeof (cpu_set_t), set) diff --git a/winsup/cygwin/release/3.4.7 b/winsup/cygwin/release/3.4.7 new file mode 100644 index 000000000000..eba5de47327d --- /dev/null +++ b/winsup/cygwin/release/3.4.7 @@ -0,0 +1,5 @@ +Bug Fixes +--------- + +Fix CPU_SET(3) macro type mismatch by making the macros type-safe. +Addresses https://cygwin.com/pipermail/cygwin/2023-March/253220.html