From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: from second.openwall.net (second.openwall.net [193.110.157.125]) by inbox.vuxu.org (Postfix) with SMTP id 05F9C26A2C for ; Mon, 3 Jun 2024 00:21:56 +0200 (CEST) Received: (qmail 18356 invoked by uid 550); 2 Jun 2024 22:21:51 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Reply-To: musl@lists.openwall.com Received: (qmail 18318 invoked from network); 2 Jun 2024 22:21:50 -0000 From: Ismael Luceno To: musl@lists.openwall.com Cc: Rich Felker , Ismael Luceno Date: Mon, 3 Jun 2024 00:21:40 +0200 Message-ID: <20240602222141.31969-1-ismael@iodev.co.uk> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [musl] [PATCH v2] ioctl: Fix implicit constant conversion overflow The last parameter (result of sizeof) to _IOC in _IOR/_IOW/_IOWR causes the underlying expression's value to be promoted to size_t. Casting it to unsigned int resolves the issue. Signed-off-by: Ismael Luceno --- arch/generic/bits/ioctl.h | 6 +++--- arch/mips/bits/ioctl.h | 6 +++--- arch/mipsn32/bits/ioctl.h | 6 +++--- arch/powerpc/bits/ioctl.h | 6 +++--- arch/powerpc64/bits/ioctl.h | 6 +++--- arch/sh/bits/ioctl.h | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/arch/generic/bits/ioctl.h b/arch/generic/bits/ioctl.h index 60ae8b850b17..524a03ca9d8d 100644 --- a/arch/generic/bits/ioctl.h +++ b/arch/generic/bits/ioctl.h @@ -4,9 +4,9 @@ #define _IOC_READ 2U #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) -#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c)) -#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c)) -#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c)) +#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) +#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),(unsigned)sizeof(c)) +#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) #define TCGETS 0x5401 #define TCSETS 0x5402 diff --git a/arch/mips/bits/ioctl.h b/arch/mips/bits/ioctl.h index e20bf19eaa77..d4eb0cfc5aba 100644 --- a/arch/mips/bits/ioctl.h +++ b/arch/mips/bits/ioctl.h @@ -4,9 +4,9 @@ #define _IOC_WRITE 4U #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) -#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c)) -#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c)) -#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c)) +#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) +#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),(unsigned)sizeof(c)) +#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) #define TCGETA 0x5401 #define TCSETA 0x5402 diff --git a/arch/mipsn32/bits/ioctl.h b/arch/mipsn32/bits/ioctl.h index e20bf19eaa77..d4eb0cfc5aba 100644 --- a/arch/mipsn32/bits/ioctl.h +++ b/arch/mipsn32/bits/ioctl.h @@ -4,9 +4,9 @@ #define _IOC_WRITE 4U #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) -#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c)) -#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c)) -#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c)) +#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) +#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),(unsigned)sizeof(c)) +#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) #define TCGETA 0x5401 #define TCSETA 0x5402 diff --git a/arch/powerpc/bits/ioctl.h b/arch/powerpc/bits/ioctl.h index ac9bfd204a84..b5d45d0c4170 100644 --- a/arch/powerpc/bits/ioctl.h +++ b/arch/powerpc/bits/ioctl.h @@ -4,9 +4,9 @@ #define _IOC_READ 2U #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) -#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c)) -#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c)) -#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c)) +#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) +#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),(unsigned)sizeof(c)) +#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) #define FIONCLEX _IO('f', 2) #define FIOCLEX _IO('f', 1) diff --git a/arch/powerpc64/bits/ioctl.h b/arch/powerpc64/bits/ioctl.h index b6cbb18f4776..02b84afff108 100644 --- a/arch/powerpc64/bits/ioctl.h +++ b/arch/powerpc64/bits/ioctl.h @@ -4,9 +4,9 @@ #define _IOC_READ 2U #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) -#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c)) -#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c)) -#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c)) +#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) +#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),(unsigned)sizeof(c)) +#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) #define FIONCLEX _IO('f', 2) #define FIOCLEX _IO('f', 1) diff --git a/arch/sh/bits/ioctl.h b/arch/sh/bits/ioctl.h index 370b6901e261..c918510302d7 100644 --- a/arch/sh/bits/ioctl.h +++ b/arch/sh/bits/ioctl.h @@ -4,9 +4,9 @@ #define _IOC_READ 2U #define _IO(a,b) _IOC(_IOC_NONE,(a),(b),0) -#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),sizeof(c)) -#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),sizeof(c)) -#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),sizeof(c)) +#define _IOW(a,b,c) _IOC(_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) +#define _IOR(a,b,c) _IOC(_IOC_READ,(a),(b),(unsigned)sizeof(c)) +#define _IOWR(a,b,c) _IOC(_IOC_READ|_IOC_WRITE,(a),(b),(unsigned)sizeof(c)) #define FIOCLEX _IO('f', 1) #define FIONCLEX _IO('f', 2) -- 2.44.0