misc/58906: memmem.c: sync with musl upstream that fixes UB on signed overflow

[nightquick%proton.me@localhost]

>Number:         58906
>Category:       misc
>Synopsis:       memmem.c: sync with musl upstream that fixes UB on signed overflow
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    misc-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Dec 14 16:40:00 +0000 2024
>Originator:     nightquick
>Release:        N/A
>Organization:
>Environment:
N/A
>Description:
Taken from the musl commit message:
unsigned char promotes to int, which can overflow when shifted left by
24 bits or more. this has been reported multiple times but then
forgotten. it's expected to be benign UB, but can trap when built with
explicit overflow catching (ubsan or similar). fix it now.

note that promotion to uint32_t is safe and portable even outside of
the assumptions usually made in musl, since either uint32_t has rank
at least unsigned int, so that no further default promotions happen,
or int is wide enough that the shift can't overflow. this is a
desirable property to have in case someone wants to reuse the code
elsewhere.

Source: https://github.com/bminor/musl/commit/593caa456309714402ca4cb77c3770f4c24da9da

Apparently, there's an unused MIN() macro, which I've removed as well.
>How-To-Repeat:

>Fix:
Change diff.

--- memmem.c.orig	2024-12-14 16:16:40.864410497 +0000
+++ memmem_patch.c	2024-12-14 16:18:46.936629028 +0000
@@ -48,8 +48,8 @@
 static char *threebyte_memmem(const unsigned char *h, size_t k,
     const unsigned char *n)
 {
-	uint32_t nw = n[0] << 24 | n[1] << 16 | n[2] << 8;
-	uint32_t hw = h[0] << 24 | h[1] << 16 | h[2] << 8;
+	uint32_t nw = (uint32_t)n[0] << 24 | n[1] << 16 | n[2] << 8;
+	uint32_t hw = (uint32_t)h[0] << 24 | h[1] << 16 | h[2] << 8;
 	for (h += 3, k -= 3; k; k--, hw = (hw|*h++) << 8)
 		if (hw == nw) return __UNCONST(h - 3);
 	return hw == nw ? __UNCONST(h - 3) : 0;
@@ -58,15 +58,14 @@
 static char *fourbyte_memmem(const unsigned char *h, size_t k,
     const unsigned char *n)
 {
-	uint32_t nw = n[0] << 24 | n[1] << 16 | n[2] << 8 | n[3];
-	uint32_t hw = h[0] << 24 | h[1] << 16 | h[2] << 8 | h[3];
+	uint32_t nw = (uint32_t)n[0] << 24 | n[1] << 16 | n[2] << 8 | n[3];
+	uint32_t hw = (uint32_t)h[0] << 24 | h[1] << 16 | h[2] << 8 | h[3];
 	for (h += 4, k -= 4; k; k--, hw = hw << 8 | *h++)
 		if (hw == nw) return __UNCONST(h - 4);
 	return hw == nw ? __UNCONST(h - 4) : 0;
 }
 
 #define MAX(a,b) ((a)>(b)?(a):(b))
-#define MIN(a,b) ((a)<(b)?(a):(b))
 
 #define BITOP(a,b,op) \
  ((a)[(size_t)(b)/(8*sizeof *(a))] op (size_t)1<<((size_t)(b)%(8*sizeof *(a))))