system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-04 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

stand/efi: Changes to efichar to allow it to be used in the kernel

Browse source 
Replace malloc/free with EFICHAR_MALLOC and EFICHAR_FREEE macros.

Obtained from:	Juniper Networks, Inc.
Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D44541
This commit is contained in:
Stephen J. Kiernan 2024-03-27 18:37:48 -04:00
parent a983cea4e9
commit fe429e6794
2 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
stand/efi/include/efichar.h
View file

@ -37,4 +37,12 @@ int ucs2_to_utf8(const efi_char *, char **);
int utf8_to_ucs2(const char *, efi_char **, size_t *);
int ucs2len(const efi_char *);
#ifdef _KERNEL
#define EFICHAR_MALLOC(sz) malloc((sz), M_TEMP, M_WAITOK | M_ZERO)
#define EFICHAR_FREE(sz) free((sz), M_TEMP)
#else
#define EFICHAR_MALLOC(sz) malloc(sz)
#define EFICHAR_FREE(sz) free(sz)
#endif
#endif /* _BOOT_EFI_EFICHAR_H_ */

17
stand/efi/libefi/efichar.c
View file

@ -25,14 +25,21 @@
*/
#include <sys/types.h>
#ifndef _KERNEL
#include <errno.h>
#endif
#ifdef _STANDALONE
#include <stand.h>
#else
#ifdef _KERNEL
#include <sys/malloc.h>
#include <sys/systm.h>
#else
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#endif
#include <sys/efi.h>
#include <machine/efi.h>
#endif
@ -87,7 +94,7 @@ ucs2_to_utf8(const efi_char *nm, char **name)
if (*name != NULL)
cp = *name;
else
cp = *name = malloc(sz);
cp = *name = EFICHAR_MALLOC(sz);
if (*name == NULL)
return (ENOMEM);
@ -114,7 +121,7 @@ ucs2_to_utf8(const efi_char *nm, char **name)
if (len >= sz) {
/* Absent bugs, we'll never return EOVERFLOW */
if (freeit) {
free(*name);
EFICHAR_FREE(*name);
*name = NULL;
}
return (EOVERFLOW);
@ -135,7 +142,7 @@ utf8_to_ucs2(const char *name, efi_char **nmp, size_t *len)
sz = strlen(name) * 2 + 2;
if (*nmp == NULL)
*nmp = malloc(sz);
*nmp = EFICHAR_MALLOC(sz);
if (*nmp == NULL)
return (ENOMEM);
nm = *nmp;
@ -183,7 +190,7 @@ utf8_to_ucs2(const char *name, efi_char **nmp, size_t *len)
}
if (sz < 2) {
if (freeit) {
free(nm);
EFICHAR_FREE(nm);
*nmp = NULL;
}
return (EDOOFUS);
@ -194,7 +201,7 @@ utf8_to_ucs2(const char *name, efi_char **nmp, size_t *len)
return (0);
ilseq:
if (freeit) {
free(nm);
EFICHAR_FREE(nm);
*nmp = NULL;
}
return (EILSEQ);