author | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-08-05 06:14:29 (GMT) |
---|---|---|
committer | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-08-05 06:17:10 (GMT) |
commit | 37d7f5f3e730c824d27417fbd57003a6a5034367 (patch) | |
tree | dac5e8be3daf791c18c888c5136eccd3e4a56323 | |
parent | e553d6586ca3dded0eec4905822cf24f26419b68 (diff) | |
download | busybox-37d7f5f3e730c824d27417fbd57003a6a5034367.zip busybox-37d7f5f3e730c824d27417fbd57003a6a5034367.tar.gz busybox-37d7f5f3e730c824d27417fbd57003a6a5034367.tar.bz2 |
mktemp: include libc mktemp, safe in busybox
This commit remove the last warning in busybox,
and prevent users to try to use mkstemp which has not
the right behavior.
Change-Id: I5aaae8044769bb1893f2430287d72b3abbee796c
-rw-r--r-- | Android.mk | 5 | ||||
-rw-r--r-- | android/libc/mktemp.c | 165 |
2 files changed, 168 insertions, 2 deletions
@@ -81,6 +81,7 @@ SUBMAKE := make -s -C $(BB_PATH) CC=$(CC) BUSYBOX_SRC_FILES = \ $(shell cat $(BB_PATH)/busybox-$(BUSYBOX_CONFIG).sources) \ + android/libc/mktemp.c \ android/libc/pty.c \ android/android.c @@ -155,6 +156,7 @@ LOCAL_C_INCLUDES := $(bb_gen)/minimal/include $(BUSYBOX_C_INCLUDES) LOCAL_CFLAGS := -Dmain=busybox_driver $(BUSYBOX_CFLAGS) LOCAL_CFLAGS += \ -DRECOVERY_VERSION \ + -Dmktemp=busybox_mktemp \ -Dgetusershell=busybox_getusershell \ -Dsetusershell=busybox_setusershell \ -Dendusershell=busybox_endusershell \ @@ -181,7 +183,6 @@ LOCAL_SRC_FILES += android/libc/__set_errno.c endif LOCAL_C_INCLUDES := $(bb_gen)/full/include $(BUSYBOX_C_INCLUDES) LOCAL_CFLAGS := $(BUSYBOX_CFLAGS) -LOCAL_LDFLAGS += -Wl,--no-fatal-warnings LOCAL_MODULE := busybox LOCAL_MODULE_TAGS := eng debug LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) @@ -220,13 +221,13 @@ LOCAL_SRC_FILES := $(BUSYBOX_SRC_FILES) LOCAL_C_INCLUDES := $(bb_gen)/full/include $(BUSYBOX_C_INCLUDES) LOCAL_CFLAGS := $(BUSYBOX_CFLAGS) LOCAL_CFLAGS += \ + -Dmktemp=busybox_mktemp \ -Dgetusershell=busybox_getusershell \ -Dsetusershell=busybox_setusershell \ -Dendusershell=busybox_endusershell \ -Dgetmntent=busybox_getmntent \ -Dgetmntent_r=busybox_getmntent_r \ -Dgenerate_uuid=busybox_generate_uuid -LOCAL_LDFLAGS += -Wl,--no-fatal-warnings LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE := static_busybox LOCAL_MODULE_STEM := busybox diff --git a/android/libc/mktemp.c b/android/libc/mktemp.c new file mode 100644 index 0000000..0a06b2d --- a/dev/null +++ b/android/libc/mktemp.c @@ -0,0 +1,165 @@ +/* + * Copyright (c) 1987, 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#if defined(LIBC_SCCS) && !defined(lint) +static char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93"; +#endif /* LIBC_SCCS and not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <ctype.h> +#include <unistd.h> + +extern u_int32_t arc4random_uniform(u_int32_t); +#define _open open + +static int _gettemp(char *, int *, int, int); + +static const char padchar[] = +"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + +static char * +_mktemp(char *path) +{ + return (_gettemp(path, (int *)NULL, 0, 0) ? path : (char *)NULL); +} + +char * +mktemp(char *path) +{ + return (_mktemp(path)); +} + +static int +_gettemp(char *path, int *doopen, int domkdir, int slen) +{ + char *start, *trv, *suffp, *carryp; + char *pad; + struct stat sbuf; + int rval; + uint32_t rand; + char carrybuf[MAXPATHLEN]; + + if ((doopen != NULL && domkdir) || slen < 0) { + errno = EINVAL; + return (0); + } + + for (trv = path; *trv != '\0'; ++trv) + ; + if (trv - path >= MAXPATHLEN) { + errno = ENAMETOOLONG; + return (0); + } + trv -= slen; + suffp = trv; + --trv; + if (trv < path || NULL != strchr(suffp, '/')) { + errno = EINVAL; + return (0); + } + + /* Fill space with random characters */ + while (trv >= path && *trv == 'X') { + rand = arc4random_uniform(sizeof(padchar) - 1); + *trv-- = padchar[rand]; + } + start = trv + 1; + + /* save first combination of random characters */ + memcpy(carrybuf, start, suffp - start); + + /* + * check the target directory. + */ + if (doopen != NULL || domkdir) { + for (; trv > path; --trv) { + if (*trv == '/') { + *trv = '\0'; + rval = stat(path, &sbuf); + *trv = '/'; + if (rval != 0) + return (0); + if (!S_ISDIR(sbuf.st_mode)) { + errno = ENOTDIR; + return (0); + } + break; + } + } + } + + for (;;) { + if (doopen) { + if ((*doopen = + _open(path, O_CREAT|O_EXCL|O_RDWR, 0600)) >= 0) + return (1); + if (errno != EEXIST) + return (0); + } else if (domkdir) { + if (mkdir(path, 0700) == 0) + return (1); + if (errno != EEXIST) + return (0); + } else if (lstat(path, &sbuf)) + return (errno == ENOENT); + + /* If we have a collision, cycle through the space of filenames */ + for (trv = start, carryp = carrybuf;;) { + /* have we tried all possible permutations? */ + if (trv == suffp) + return (0); /* yes - exit with EEXIST */ + pad = strchr(padchar, *trv); + if (pad == NULL) { + /* this should never happen */ + errno = EIO; + return (0); + } + /* increment character */ + *trv = (*++pad == '\0') ? padchar[0] : *pad; + /* carry to next position? */ + if (*trv == *carryp) { + /* increment position and loop */ + ++trv; + ++carryp; + } else { + /* try with new name */ + break; + } + } + } + /*NOTREACHED*/ +} |