xiaoxiang781216 commented on code in PR #10602:
URL: https://github.com/apache/nuttx/pull/10602#discussion_r1359771817
##########
libs/libc/stdio/lib_fclose.c:
##########
@@ -115,32 +115,41 @@ int fclose(FAR FILE *stream)
nxmutex_unlock(&slist->sl_lock);
- /* Check that the underlying file descriptor corresponds to an an open
- * file.
- */
+ /* Close the file descriptor and save the return status */
- if (stream->fs_fd >= 0)
+#ifdef CONFIG_FDSAN
+ if (stream->fs_hascookie == 0)
{
- /* Close the file descriptor and save the return status */
+ /* This is a little warkaround. Ideally we would want to call
+ * fs_iofunc.close and let that handle it. FDSAN however requires
+ * stream to create owner tag and this is not avalialble in
Review Comment:
you can get back the stream through FIOC_GETTAG, so it's possible to move
android_fdsan_xxx into lib_fclose_cb.
##########
fs/vfs/fs_fdopen.c:
##########
@@ -120,7 +120,7 @@ int fs_fdopen(int fd, int oflags, FAR struct tcb_s *tcb,
/* Check input parameters */
- if (fd < 0)
+ if (fd < 0 && cookie == 0)
Review Comment:
with https://github.com/apache/nuttx/pull/10913, you could move FILE
allocation into fopencookie, and forward fdopen to fopencookie.
##########
libs/libc/stdio/lib_stdio_cb.c:
##########
@@ -0,0 +1,90 @@
+/****************************************************************************
+ * libs/libc/stdio/lib_stdio_cb.c
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
+ * ASF licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
+ * License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+
+#include "libc.h"
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: lib_fseek_cb
+ ****************************************************************************/
+
+off_t lib_fseek_cb(FAR void *cookie, off_t *offset, int whence)
+{
+ int fd = (int)(intptr_t)cookie;
+ return lseek(fd, *offset, whence);
+}
+
+/****************************************************************************
+ * Name: lib_fwrite_cb
+ ****************************************************************************/
+
+ssize_t lib_fwrite_cb(FAR void *cookie, FAR const char *buf, size_t size)
+{
+ int fd = (int)(intptr_t)cookie;
+ return _NX_WRITE(fd, buf, size);
+}
+
+/****************************************************************************
+ * Name: lib_fread_cb
+ ****************************************************************************/
+
+ssize_t lib_fread_cb(FAR void *cookie, FAR char *buf, size_t size)
+{
+ int fd = (int)(intptr_t)cookie;
+ return _NX_READ(fd, buf, size);
+}
+
+/****************************************************************************
+ * Name: lib_fclose_cb
+ ****************************************************************************/
+
+int lib_fclose_cb(FAR void *cookie)
+{
+ int fd = (int)(intptr_t)cookie;
Review Comment:
close will do the check for us
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
