From ae401cecdd3c076974184bd6cc02c93cada5fc64 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 30 Mar 2020 09:00:51 -0600 Subject: [PATCH] Check return from nxsem_wait_initialize() Resolution of Issue 619 will require multiple steps, this part of the first step in that resolution: Every call to nxsem_wait_uninterruptible() must handle the return value from nxsem_wait_uninterruptible properly. This commit is only for those files under fs/driver, fs/aio, fs/nfs, crypto/, and boards/. Please note: The modified file under fs/nfs generates several " Mixed case identifier found" errors. Please ignore these. These cannot be fixed without changes to numerous other files. They also follow a non-standard convention that is used many files: Using lower case structure names in custom SIZEOF_ definitions. --- .../arm/samv7/samv71-xult/src/sam_ili9488.c | 49 +- crypto/random_pool.c | 59 ++- fs/aio/aio.h | 43 +- fs/aio/aio_cancel.c | 41 +- fs/aio/aio_initialize.c | 94 ++-- fs/aio/aioc_contain.c | 95 ++-- fs/driver/fs_blockproxy.c | 46 +- fs/driver/fs_mtdproxy.c | 13 +- fs/inode/fs_inoderelease.c | 14 +- fs/mqueue/mq_close.c | 13 +- fs/nfs/Kconfig | 2 +- fs/nfs/nfs_vfsops.c | 426 ++++++++++-------- fs/semaphore/sem_close.c | 13 +- 13 files changed, 496 insertions(+), 412 deletions(-) diff --git a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c index cc0fbd8769..be0009e058 100644 --- a/boards/arm/samv7/samv71-xult/src/sam_ili9488.c +++ b/boards/arm/samv7/samv71-xult/src/sam_ili9488.c @@ -204,7 +204,7 @@ # define CONFIG_SAMV71XULT_LCD_BGCOLOR 0 #endif -/* Display/Color Properties **************************************************/ +/* Display/Color Properties *************************************************/ /* Display Resolution */ @@ -228,7 +228,7 @@ #define RGB_BLUE(rgb) RGB16BLUE(rgb) #define RGB_COLOR(r,g,b) RGBTO16(r,g,b) -/* SAMV7-XULT LCD Hardware Definitions ***************************************/ +/* SAMV7-XULT LCD Hardware Definitions **************************************/ /* LCD /CS is NCS3 */ @@ -286,7 +286,7 @@ # define LCD_RUNBUFFER_PIXELS SAM_XRES #endif -/* Debug *********************************************************************/ +/* Debug ********************************************************************/ #ifdef CONFIG_DEBUG_DMA # define SAMPLENDX_BEFORE_SETUP 0 @@ -422,7 +422,8 @@ static int sam_getplaneinfo(FAR struct lcd_dev_s *dev, unsigned int planeno, static int sam_getpower(FAR struct lcd_dev_s *dev); static int sam_setpower(FAR struct lcd_dev_s *dev, int power); static int sam_getcontrast(FAR struct lcd_dev_s *dev); -static int sam_setcontrast(FAR struct lcd_dev_s *dev, unsigned int contrast); +static int sam_setcontrast(FAR struct lcd_dev_s *dev, + unsigned int contrast); /* Initialization */ @@ -458,26 +459,27 @@ static const uint32_t g_lcdpin[] = * if there are multiple LCD devices, they must each have unique run buffers. */ -static uint16_t g_runbuffer[LCD_RUNBUFFER_BYTES] __attribute__((aligned(LCD_ALIGN))); +static uint16_t g_runbuffer[LCD_RUNBUFFER_BYTES] + __attribute__((aligned(LCD_ALIGN))); /* This structure describes the overall LCD video controller */ static const struct fb_videoinfo_s g_videoinfo = { - .fmt = SAM_COLORFMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */ - .xres = SAM_XRES, /* Horizontal resolution in pixel columns */ - .yres = SAM_YRES, /* Vertical resolution in pixel rows */ - .nplanes = 1, /* Number of color planes supported */ + .fmt = SAM_COLORFMT, /* Color format: RGB16-565: RRRR RGGG GGGB BBBB */ + .xres = SAM_XRES, /* Horizontal resolution in pixel columns */ + .yres = SAM_YRES, /* Vertical resolution in pixel rows */ + .nplanes = 1, /* Number of color planes supported */ }; /* This is the standard, NuttX Plane information object */ static const struct lcd_planeinfo_s g_planeinfo = { - .putrun = sam_putrun, /* Put a run into LCD memory */ - .getrun = sam_getrun, /* Get a run from LCD memory */ - .buffer = (uint8_t*)g_runbuffer, /* Run scratch buffer */ - .bpp = SAM_BPP, /* Bits-per-pixel */ + .putrun = sam_putrun, /* Put a run into LCD memory */ + .getrun = sam_getrun, /* Get a run from LCD memory */ + .buffer = (FAR uint8_t *)g_runbuffer, /* Run scratch buffer */ + .bpp = SAM_BPP, /* Bits-per-pixel */ }; /* This is the ILI9488 LCD driver object */ @@ -751,7 +753,8 @@ static void sam_disable_backlight(void) * Name: sam_set_backlight * * Description: - * The the backlight to the level associated with the specified power value. + * The the backlight to the level associated with the specified power + * value. * ****************************************************************************/ @@ -994,7 +997,11 @@ static int sam_lcd_dmawait(FAR struct sam_dev_s *priv, uint32_t timeout) * incremented and there will be no wait. */ - nxsem_wait_uninterruptible(&priv->waitsem); + ret = nxsem_wait_uninterruptible(&priv->waitsem); + if (ret < 0) + { + return ret; + } } /* Dump the collect DMA sample data */ @@ -1041,7 +1048,8 @@ static void sam_lcd_dmacallback(DMA_HANDLE handle, void *arg, int result) ****************************************************************************/ static int sam_lcd_txtransfer(FAR struct sam_dev_s *priv, - FAR const uint16_t *buffer, unsigned int buflen) + FAR const uint16_t *buffer, + unsigned int buflen) { irqstate_t flags; int ret; @@ -1083,7 +1091,8 @@ static int sam_lcd_txtransfer(FAR struct sam_dev_s *priv, ****************************************************************************/ static int sam_lcd_rxtransfer(FAR struct sam_dev_s *priv, - FAR const uint16_t *buffer, unsigned int buflen) + FAR const uint16_t *buffer, + unsigned int buflen) { irqstate_t flags; int ret; @@ -1415,7 +1424,11 @@ static inline void sam_smc_initialize(void) static inline int sam_lcd_initialize(void) { FAR struct sam_dev_s *priv = &g_lcddev; - uint8_t buffer[4] = {0, 0, 0, 0}; + uint8_t buffer[4] = + { + 0, 0, 0, 0 + }; + uint16_t id; uint16_t param; int ret; diff --git a/crypto/random_pool.c b/crypto/random_pool.c index a4b3cf9006..93843a9eec 100644 --- a/crypto/random_pool.c +++ b/crypto/random_pool.c @@ -120,9 +120,13 @@ static struct entropy_pool_s entropy_pool; #endif /* Polynomial from paper "The Linux Pseudorandom Number Generator Revisited" - * x^POOL_SIZE + x^104 + x^76 + x^51 + x^25 + x + 1 */ + * x^POOL_SIZE + x^104 + x^76 + x^51 + x^25 + x + 1 + */ -static const uint32_t pool_stir[] = { POOL_SIZE, 104, 76, 51, 25, 1 }; +static const uint32_t pool_stir[] = +{ + POOL_SIZE, 104, 76, 51, 25, 1 +}; /* Derived from IEEE 802.3 CRC-32 */ @@ -198,7 +202,7 @@ static void addentropy(FAR const uint32_t *buf, size_t n, bool inc_new) { g_rng.rd_newentr += 1; } - } + } } /**************************************************************************** @@ -260,15 +264,18 @@ static void getentropy(FAR blake2s_state *S) * number generator (DRBG) as used here. BLAKE2 specification is available * at https://blake2.net/ * - * BLAKE2Xs here implementation is based on public-domain/CC0 BLAKE2 reference - * implementation by Samual Neves, at - * https://github.com/BLAKE2/BLAKE2/tree/master/ref - * Copyright 2012, Samuel Neves + * BLAKE2Xs here implementation is based on public-domain/CC0 BLAKE2 + * reference implementation by Samual Neves, at + * + * https://github.com/BLAKE2/BLAKE2/tree/master/ref + * Copyright 2012, Samuel Neves */ static void rng_reseed(void) { - blake2s_param P = {}; + blake2s_param P = + { + }; /* Reset output node counter. */ @@ -336,8 +343,9 @@ static void rng_buf_internal(FAR void *bytes, size_t nbytes) } else if (g_rng.blake2xs.out_node_offset == UINT32_MAX) { - /* Maximum BLAKE2Xs output reached (2^32-1 output blocks, maximum 128 GiB - * bytes), reseed. */ + /* Maximum BLAKE2Xs output reached (2^32-1 output blocks, maximum 128 + * GiB bytes), reseed. + */ rng_reseed(); } @@ -436,7 +444,8 @@ void up_rngaddentropy(enum rnd_source_t kindof, FAR const uint32_t *buf, if (kindof == RND_SRC_IRQ && n > 0) { /* Ignore interrupt randomness if previous interrupt was from same - * source. */ + * source. + */ if (buf[0] == g_rng.rd_prev_irq) { @@ -463,7 +472,8 @@ void up_rngaddentropy(enum rnd_source_t kindof, FAR const uint32_t *buf, uint8_t curr_time = ts.tv_sec * 8 + ts.tv_nsec / (NSEC_PER_SEC / 8); /* Allow interrupts/timers increase entropy counter at max rate - * of 8 Hz. */ + * of 8 Hz. + */ if (g_rng.rd_prev_time == curr_time) { @@ -500,14 +510,18 @@ void up_rngaddentropy(enum rnd_source_t kindof, FAR const uint32_t *buf, void up_rngreseed(void) { - nxsem_wait_uninterruptible(&g_rng.rd_sem); + int ret; - if (g_rng.rd_newentr >= MIN_SEED_NEW_ENTROPY_WORDS) + ret = nxsem_wait_uninterruptible(&g_rng.rd_sem); + if (ret >= 0) { - rng_reseed(); - } + if (g_rng.rd_newentr >= MIN_SEED_NEW_ENTROPY_WORDS) + { + rng_reseed(); + } - nxsem_post(&g_rng.rd_sem); + nxsem_post(&g_rng.rd_sem); + } } /**************************************************************************** @@ -549,7 +563,12 @@ void up_randompool_initialize(void) void getrandom(FAR void *bytes, size_t nbytes) { - nxsem_wait_uninterruptible(&g_rng.rd_sem); - rng_buf_internal(bytes, nbytes); - nxsem_post(&g_rng.rd_sem); + int ret; + + ret = nxsem_wait_uninterruptible(&g_rng.rd_sem); + if (ret >= 0) + { + rng_buf_internal(bytes, nbytes); + nxsem_post(&g_rng.rd_sem); + } } diff --git a/fs/aio/aio.h b/fs/aio/aio.h index e94cdf18c2..111afa77fc 100644 --- a/fs/aio/aio.h +++ b/fs/aio/aio.h @@ -1,35 +1,20 @@ /**************************************************************************** * fs/aio/aio.h * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * 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 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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 NuttX 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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. + * 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. * ****************************************************************************/ @@ -150,11 +135,11 @@ void aio_initialize(void); * None * * Returned Value: - * None + * aio_lock() return -ECANCELED if the calling thread is canceled. * ****************************************************************************/ -void aio_lock(void); +int aio_lock(void); void aio_unlock(void); /**************************************************************************** diff --git a/fs/aio/aio_cancel.c b/fs/aio/aio_cancel.c index 1bfe747ef9..fd733cdb2d 100644 --- a/fs/aio/aio_cancel.c +++ b/fs/aio/aio_cancel.c @@ -1,35 +1,20 @@ /**************************************************************************** * fs/aio/aio_cancel.c * - * Copyright (C) 2014 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * 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 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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 NuttX 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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. + * 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. * ****************************************************************************/ @@ -110,7 +95,7 @@ int aio_cancel(int fildes, FAR struct aiocb *aiocbp) ret = AIO_ALLDONE; sched_lock(); - aio_lock(); + ret = aio_lock(); if (aiocbp) { diff --git a/fs/aio/aio_initialize.c b/fs/aio/aio_initialize.c index 090e1e1fa8..deebb812f8 100644 --- a/fs/aio/aio_initialize.c +++ b/fs/aio/aio_initialize.c @@ -1,35 +1,20 @@ /**************************************************************************** * fs/aio/aio_initialize.c * - * Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * 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 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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 NuttX 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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. + * 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. * ****************************************************************************/ @@ -140,13 +125,14 @@ void aio_initialize(void) * None * * Returned Value: - * None + * aio_lock() return -ECANCELED if the calling thread is canceled. * ****************************************************************************/ -void aio_lock(void) +int aio_lock(void) { pid_t me = getpid(); + int ret = OK; /* Does this thread already hold the semaphore? */ @@ -159,13 +145,17 @@ void aio_lock(void) } else { - nxsem_wait_uninterruptible(&g_aio_exclsem); + ret = nxsem_wait_uninterruptible(&g_aio_exclsem); + if (ret >= 0) + { + /* And mark it as ours */ - /* And mark it as ours */ - - g_aio_holder = me; - g_aio_count = 1; + g_aio_holder = me; + g_aio_count = 1; + } } + + return ret; } void aio_unlock(void) @@ -211,21 +201,30 @@ void aio_unlock(void) FAR struct aio_container_s *aioc_alloc(void) { - FAR struct aio_container_s *aioc; + FAR struct aio_container_s *aioc = NULL; + int ret; /* Take a count from semaphore, thus guaranteeing that we have an AIO * container set aside for us. */ - nxsem_wait_uninterruptible(&g_aioc_freesem); + ret = nxsem_wait_uninterruptible(&g_aioc_freesem); + if (ret < 0) + { + return NULL; + } /* Get our AIO container */ - aio_lock(); - aioc = (FAR struct aio_container_s *)dq_remfirst(&g_aioc_free); - aio_unlock(); + ret = aio_lock(); + if (ret >= 0) + { + aioc = (FAR struct aio_container_s *)dq_remfirst(&g_aioc_free); + aio_unlock(); + + DEBUGASSERT(aioc); + } - DEBUGASSERT(aioc); return aioc; } @@ -246,11 +245,24 @@ FAR struct aio_container_s *aioc_alloc(void) void aioc_free(FAR struct aio_container_s *aioc) { + int ret; + DEBUGASSERT(aioc); /* Return the container to the free list */ - aio_lock(); + do + { + ret = aio_lock(); + + /* The only possible error should be if we were awakened only by + * thread cancellation. + */ + + DEBUGASSERT(ret == OK || ret == -ECANCELED); + } + while (ret < 0); + dq_addlast(&aioc->aioc_link, &g_aioc_free); aio_unlock(); diff --git a/fs/aio/aioc_contain.c b/fs/aio/aioc_contain.c index c9b7aac52a..ac0984ff74 100644 --- a/fs/aio/aioc_contain.c +++ b/fs/aio/aioc_contain.c @@ -1,35 +1,20 @@ /**************************************************************************** * fs/aio/aioc_contain.c * - * Copyright (C) 2014, 2017-2018 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * 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 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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 NuttX 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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. + * 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. * ****************************************************************************/ @@ -121,29 +106,38 @@ FAR struct aio_container_s *aio_contain(FAR struct aiocb *aiocbp) #endif /* Allocate the AIO control block container, waiting for one to become - * available if necessary. This should never fail. + * available if necessary. This should not fail except for in the case + * where the calling thread is canceled. */ aioc = aioc_alloc(); - DEBUGASSERT(aioc); + if (aioc != NULL) + { + /* Initialize the container */ - /* Initialize the container */ - - memset(aioc, 0, sizeof(struct aio_container_s)); - aioc->aioc_aiocbp = aiocbp; - aioc->u.ptr = u.ptr; - aioc->aioc_pid = getpid(); + memset(aioc, 0, sizeof(struct aio_container_s)); + aioc->aioc_aiocbp = aiocbp; + aioc->u.ptr = u.ptr; + aioc->aioc_pid = getpid(); #ifdef CONFIG_PRIORITY_INHERITANCE - DEBUGVERIFY(nxsched_getparam (aioc->aioc_pid, ¶m)); - aioc->aioc_prio = param.sched_priority; + DEBUGVERIFY(nxsched_getparam (aioc->aioc_pid, ¶m)); + aioc->aioc_prio = param.sched_priority; #endif - /* Add the container to the pending transfer list. */ + /* Add the container to the pending transfer list. */ + + ret = aio_lock(); + if (ret < 0) + { + aioc_free(aioc); + goto errout; + } + + dq_addlast(&aioc->aioc_link, &g_aio_pending); + aio_unlock(); + } - aio_lock(); - dq_addlast(&aioc->aioc_link, &g_aio_pending); - aio_unlock(); return aioc; errout: @@ -168,21 +162,26 @@ errout: FAR struct aiocb *aioc_decant(FAR struct aio_container_s *aioc) { - FAR struct aiocb *aiocbp; + FAR struct aiocb *aiocbp = NULL; + int ret; DEBUGASSERT(aioc); /* Remove the container to the pending transfer list. */ - aio_lock(); - dq_rem(&aioc->aioc_link, &g_aio_pending); + ret = aio_lock(); + if (ret >= 0) + { + dq_rem(&aioc->aioc_link, &g_aio_pending); - /* De-cant the AIO control block and return the container to the free list */ + /* De-cant the AIO control block and return the container to the free list */ - aiocbp = aioc->aioc_aiocbp; - aioc_free(aioc); + aiocbp = aioc->aioc_aiocbp; + aioc_free(aioc); + + aio_unlock(); + } - aio_unlock(); return aiocbp; } diff --git a/fs/driver/fs_blockproxy.c b/fs/driver/fs_blockproxy.c index 83a8e26e1b..c508f32566 100644 --- a/fs/driver/fs_blockproxy.c +++ b/fs/driver/fs_blockproxy.c @@ -1,35 +1,20 @@ /**************************************************************************** * fs/driver/fs_blockproxy.c * - * Copyright (C) 2015-2018 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt + * 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 * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * http://www.apache.org/licenses/LICENSE-2.0 * - * 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 NuttX 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 COPYRIGHT HOLDERS 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 - * COPYRIGHT OWNER 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. + * 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. * ****************************************************************************/ @@ -101,7 +86,12 @@ static FAR char *unique_chardev(void) { /* Get the semaphore protecting the path number */ - nxsem_wait_uninterruptible(&g_devno_sem); + ret = nxsem_wait_uninterruptible(&g_devno_sem); + if (ret < 0) + { + ferr("ERROR: nxsem_wait_uninterruptible failed: %d\n", ret); + return NULL; + } /* Get the next device number and release the semaphore */ diff --git a/fs/driver/fs_mtdproxy.c b/fs/driver/fs_mtdproxy.c index df51277cd4..2aae832084 100644 --- a/fs/driver/fs_mtdproxy.c +++ b/fs/driver/fs_mtdproxy.c @@ -96,7 +96,12 @@ static FAR char *unique_blkdev(void) { /* Get the semaphore protecting the path number */ - nxsem_wait_uninterruptible(&g_devno_sem); + ret = nxsem_wait_uninterruptible(&g_devno_sem); + if (ret < 0) + { + ferr("ERROR: nxsem_wait_uninterruptible failed: %d\n", ret); + return NULL; + } /* Get the next device number and release the semaphore */ @@ -197,9 +202,9 @@ int mtd_proxy(FAR const char *mtddev, int mountflags, goto out_with_fltdev; } - /* Unlink and free the block device name. The driver instance will persist, - * provided that CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y (otherwise, we have - * a problem here!) + /* Unlink and free the block device name. The driver instance will + * persist, provided that CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y (otherwise, + * we have a problem here!) */ out_with_fltdev: diff --git a/fs/inode/fs_inoderelease.c b/fs/inode/fs_inoderelease.c index 41953f781a..237c1f6ce0 100644 --- a/fs/inode/fs_inoderelease.c +++ b/fs/inode/fs_inoderelease.c @@ -52,16 +52,18 @@ void inode_release(FAR struct inode *node) { /* Decrement the references of the inode */ - ret = inode_semtake(); - if (ret < 0) + do { - /* REVISIT: Reference count will be wrong. This could only - * happen on thread cancellation. + ret = inode_semtake(); + + /* This only possible error is due to cancellation of the thread. + * We need to try again anyway in this case, otherwise the + * reference count would be wrong. */ - ferr("ERROR: inode_semtake failed: %d\n", ret); - return; + DEBUGASSERT(ret = OK || ret == -ECANCELED); } + while (ret < 0); if (node->i_crefs) { diff --git a/fs/mqueue/mq_close.c b/fs/mqueue/mq_close.c index 01ffc7fed6..63cc545840 100644 --- a/fs/mqueue/mq_close.c +++ b/fs/mqueue/mq_close.c @@ -176,16 +176,17 @@ void mq_inode_release(FAR struct inode *inode) /* Decrement the reference count on the inode */ - ret = inode_semtake(); - if (ret < 0) + do { - /* REVISIT: Should get here only on task cancellation. The MQ inode - * would not not be released in this case. + ret = inode_semtake(); + + /* The only error that is expected is due to thread cancellation. + * At this point, we must continue to free the mqueue anyway. */ - ferr("ERROR: inode_semtake() failed: %d\n", ret); - return; + DEBUGASSERT(ret == OK || ret == -ECANCELED); } + while (ret < 0); if (inode->i_crefs > 0) { diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig index 19a1a88723..86fc555de1 100644 --- a/fs/nfs/Kconfig +++ b/fs/nfs/Kconfig @@ -13,7 +13,7 @@ config NFS #if NFS config NFS_STATISTICS - bool "NFS Statics" + bool "NFS Statistics" default n depends on NFS ---help--- diff --git a/fs/nfs/nfs_vfsops.c b/fs/nfs/nfs_vfsops.c index 3c3c6a1a88..45b8e935fa 100644 --- a/fs/nfs/nfs_vfsops.c +++ b/fs/nfs/nfs_vfsops.c @@ -1,7 +1,8 @@ /**************************************************************************** * fs/nfs/nfs_vfsops.c * - * Copyright (C) 2012-2013, 2015, 2017-2018 Gregory Nutt. All rights reserved. + * Copyright (C) 2012-2013, 2015, 2017-2018 Gregory Nutt. All rights + * reserved. * Copyright (C) 2012 Jose Pablo Rojas Vargas. All rights reserved. * Author: Jose Pablo Rojas Vargas * Gregory Nutt @@ -107,7 +108,7 @@ static uint32_t nfs_xdrneg1; * Private Function Prototypes ****************************************************************************/ -static void nfs_semtake(FAR struct nfsmount *nmp); +static int nfs_semtake(FAR struct nfsmount *nmp); static void nfs_semgive(FAR struct nfsmount *nmp); static int nfs_filecreate(FAR struct nfsmount *nmp, @@ -130,8 +131,8 @@ static int nfs_dup(FAR const struct file *oldp, FAR struct file *newp); static int nfs_fsinfo(FAR struct nfsmount *nmp); static int nfs_fstat(FAR const struct file *filep, FAR struct stat *buf); static int nfs_truncate(FAR struct file *filep, off_t length); -static int nfs_opendir(FAR struct inode *mountpt, FAR const char *relpath, - FAR struct fs_dirent_s *dir); +static int nfs_opendir(FAR struct inode *mountpt, + FAR const char *relpath, FAR struct fs_dirent_s *dir); static int nfs_readdir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir); static int nfs_rewinddir(FAR struct inode *mountpt, @@ -204,9 +205,9 @@ const struct mountpt_operations nfs_operations = * Name: nfs_semtake ****************************************************************************/ -static void nfs_semtake(FAR struct nfsmount *nmp) +static int nfs_semtake(FAR struct nfsmount *nmp) { - nxsem_wait_uninterruptible(&nmp->nm_sem); + return nxsem_wait_uninterruptible(&nmp->nm_sem); } /**************************************************************************** @@ -240,15 +241,15 @@ static int nfs_filecreate(FAR struct nfsmount *nmp, FAR struct nfsnode *np, uint32_t tmp; int namelen; int reqlen; - int error; + int ret; /* Find the NFS node of the directory containing the file to be created */ - error = nfs_finddir(nmp, relpath, &fhandle, &fattr, filename); - if (error != OK) + ret = nfs_finddir(nmp, relpath, &fhandle, &fattr, filename); + if (ret != OK) { - ferr("ERROR: nfs_finddir returned: %d\n", error); - return error; + ferr("ERROR: nfs_finddir returned: %d\n", ret); + return ret; } /* Create the CREATE RPC call arguments */ @@ -323,13 +324,13 @@ static int nfs_filecreate(FAR struct nfsmount *nmp, FAR struct nfsnode *np, /* Send the NFS request. */ nfs_statistics(NFSPROC_CREATE); - error = nfs_request(nmp, NFSPROC_CREATE, - (FAR void *)&nmp->nm_msgbuffer.create, reqlen, - (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); + ret = nfs_request(nmp, NFSPROC_CREATE, + (FAR void *)&nmp->nm_msgbuffer.create, reqlen, + (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); /* Check for success */ - if (error == OK) + if (ret == OK) { /* Parse the returned data */ @@ -370,7 +371,7 @@ static int nfs_filecreate(FAR struct nfsmount *nmp, FAR struct nfsnode *np, /* Any following dir_wcc data is ignored for now */ } - return error; + return ret; } /**************************************************************************** @@ -389,7 +390,7 @@ static int nfs_filetruncate(FAR struct nfsmount *nmp, { FAR uint32_t *ptr; int reqlen; - int error; + int ret; finfo("Truncating file\n"); @@ -423,13 +424,13 @@ static int nfs_filetruncate(FAR struct nfsmount *nmp, /* Perform the SETATTR RPC */ nfs_statistics(NFSPROC_SETATTR); - error = nfs_request(nmp, NFSPROC_SETATTR, - (FAR void *)&nmp->nm_msgbuffer.setattr, reqlen, - (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); - if (error != OK) + ret = nfs_request(nmp, NFSPROC_SETATTR, + (FAR void *)&nmp->nm_msgbuffer.setattr, reqlen, + (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); + if (ret != OK) { - ferr("ERROR: nfs_request failed: %d\n", error); - return error; + ferr("ERROR: nfs_request failed: %d\n", ret); + return ret; } /* Get a pointer to the SETATTR reply data */ @@ -476,15 +477,15 @@ static int nfs_fileopen(FAR struct nfsmount *nmp, FAR struct nfsnode *np, struct file_handle fhandle; struct nfs_fattr fattr; uint32_t tmp; - int error = 0; + int ret = 0; /* Find the NFS node associate with the path */ - error = nfs_findnode(nmp, relpath, &fhandle, &fattr, NULL); - if (error != OK) + ret = nfs_findnode(nmp, relpath, &fhandle, &fattr, NULL); + if (ret != OK) { - ferr("ERROR: nfs_findnode returned: %d\n", error); - return error; + ferr("ERROR: nfs_findnode returned: %d\n", ret); + return ret; } /* Check if the object is a directory */ @@ -515,7 +516,7 @@ static int nfs_fileopen(FAR struct nfsmount *nmp, FAR struct nfsnode *np, } } - /* It would be an error if we are asked to create the file exclusively */ + /* It would be an ret if we are asked to create the file exclusively */ if ((oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL)) { @@ -572,7 +573,7 @@ static int nfs_open(FAR struct file *filep, FAR const char *relpath, { FAR struct nfsmount *nmp; FAR struct nfsnode *np; - int error; + int ret; /* Sanity checks */ @@ -594,22 +595,27 @@ static int nfs_open(FAR struct file *filep, FAR const char *relpath, return -ENOMEM; } - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + kmm_free(np); + return ret; + } /* Try to open an existing file at that path */ - error = nfs_fileopen(nmp, np, relpath, oflags, mode); - if (error != OK) + ret = nfs_fileopen(nmp, np, relpath, oflags, mode); + if (ret != OK) { - /* An error occurred while trying to open the existing file. Check if + /* An ret occurred while trying to open the existing file. Check if * the open failed because the file does not exist. That is not - * necessarily an error; that may only mean that we have to create the + * necessarily an ret; that may only mean that we have to create the * file. */ - if (error != -ENOENT) + if (ret != -ENOENT) { - ferr("ERROR: nfs_fileopen failed: %d\n", error); + ferr("ERROR: nfs_fileopen failed: %d\n", ret); goto errout_with_semaphore; } @@ -630,10 +636,10 @@ static int nfs_open(FAR struct file *filep, FAR const char *relpath, /* Create the file */ - error = nfs_filecreate(nmp, np, relpath, mode); - if (error != OK) + ret = nfs_filecreate(nmp, np, relpath, mode); + if (ret != OK) { - ferr("ERROR: nfs_filecreate failed: %d\n", error); + ferr("ERROR: nfs_filecreate failed: %d\n", ret); goto errout_with_semaphore; } } @@ -667,7 +673,7 @@ errout_with_semaphore: } nfs_semgive(nmp); - return error; + return ret; } /**************************************************************************** @@ -702,7 +708,11 @@ static int nfs_close(FAR struct file *filep) /* Get exclusive access to the mount structure. */ - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } /* Decrement the reference count. If the reference count would not * decrement to zero, then that is all we have to do. @@ -783,7 +793,7 @@ static ssize_t nfs_read(FAR struct file *filep, FAR char *buffer, ssize_t bytesread; size_t reqlen; FAR uint32_t *ptr; - int error = 0; + int ret = 0; finfo("Read %d bytes from offset %d\n", buflen, filep->f_pos); @@ -798,7 +808,11 @@ static ssize_t nfs_read(FAR struct file *filep, FAR char *buffer, DEBUGASSERT(nmp != NULL); - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return (ssize_t)ret; + } /* Get the number of bytes left in the file and truncate read count so that * it does not exceed the number of bytes left in the file. @@ -860,12 +874,12 @@ static ssize_t nfs_read(FAR struct file *filep, FAR char *buffer, finfo("Reading %d bytes\n", readsize); nfs_statistics(NFSPROC_READ); - error = nfs_request(nmp, NFSPROC_READ, - (FAR void *)&nmp->nm_msgbuffer.read, reqlen, - (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); - if (error) + ret = nfs_request(nmp, NFSPROC_READ, + (FAR void *)&nmp->nm_msgbuffer.read, reqlen, + (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); + if (ret) { - ferr("ERROR: nfs_request failed: %d\n", error); + ferr("ERROR: nfs_request failed: %d\n", ret); goto errout_with_semaphore; } @@ -873,7 +887,8 @@ static ssize_t nfs_read(FAR struct file *filep, FAR char *buffer, * response data. */ - ptr = (FAR uint32_t *)&((FAR struct rpc_reply_read *)nmp->nm_iobuffer)->read; + ptr = (FAR uint32_t *) + &((FAR struct rpc_reply_read *)nmp->nm_iobuffer)->read; /* Check if attributes are included in the responses */ @@ -923,7 +938,7 @@ static ssize_t nfs_read(FAR struct file *filep, FAR char *buffer, errout_with_semaphore: nfs_semgive(nmp); - return bytesread > 0 ? bytesread : error; + return bytesread > 0 ? bytesread : ret; } /**************************************************************************** @@ -948,7 +963,7 @@ static ssize_t nfs_write(FAR struct file *filep, FAR const char *buffer, uint32_t tmp; int commit = 0; int committed = NFSV3WRITE_FILESYNC; - int error; + int ret; finfo("Write %d bytes to offset %d\n", buflen, filep->f_pos); @@ -963,13 +978,17 @@ static ssize_t nfs_write(FAR struct file *filep, FAR const char *buffer, DEBUGASSERT(nmp != NULL); - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return (ssize_t)ret; + } /* Check if the file size would exceed the range of off_t */ if (np->n_size + buflen < np->n_size) { - error = -EFBIG; + ret = -EFBIG; goto errout_with_semaphore; } @@ -999,7 +1018,7 @@ static ssize_t nfs_write(FAR struct file *filep, FAR const char *buffer, /* Initialize the request. Here we need an offset pointer to the write * arguments, skipping over the RPC header. Write is unique among the - * RPC calls in that the entry RPC calls messasge lies in the I/O buffer + * RPC calls in that the entry RPC calls message lies in the I/O buffer */ ptr = (FAR uint32_t *)&((FAR struct rpc_call_write *) @@ -1037,13 +1056,13 @@ static ssize_t nfs_write(FAR struct file *filep, FAR const char *buffer, /* Perform the write */ nfs_statistics(NFSPROC_WRITE); - error = nfs_request(nmp, NFSPROC_WRITE, - (FAR void *)nmp->nm_iobuffer, reqlen, - (FAR void *)&nmp->nm_msgbuffer.write, - sizeof(struct rpc_reply_write)); - if (error) + ret = nfs_request(nmp, NFSPROC_WRITE, + (FAR void *)nmp->nm_iobuffer, reqlen, + (FAR void *)&nmp->nm_msgbuffer.write, + sizeof(struct rpc_reply_write)); + if (ret) { - ferr("ERROR: nfs_request failed: %d\n", error); + ferr("ERROR: nfs_request failed: %d\n", ret); goto errout_with_semaphore; } @@ -1079,7 +1098,7 @@ static ssize_t nfs_write(FAR struct file *filep, FAR const char *buffer, if (tmp < 1 || tmp > writesize) { - error = -EIO; + ret = -EIO; goto errout_with_semaphore; } @@ -1107,7 +1126,7 @@ static ssize_t nfs_write(FAR struct file *filep, FAR const char *buffer, errout_with_semaphore: nfs_semgive(nmp); - return byteswritten > 0 ? byteswritten : error; + return byteswritten > 0 ? byteswritten : ret; } /**************************************************************************** @@ -1122,6 +1141,7 @@ static int nfs_dup(FAR const struct file *oldp, FAR struct file *newp) { FAR struct nfsmount *nmp; FAR struct nfsnode *np; + int ret; finfo("Dup %p->%p\n", oldp, newp); @@ -1136,7 +1156,11 @@ static int nfs_dup(FAR const struct file *oldp, FAR struct file *newp) DEBUGASSERT(nmp != NULL); - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } /* Increment the reference count on the NFS node structure */ @@ -1164,6 +1188,7 @@ static int nfs_fstat(FAR const struct file *filep, FAR struct stat *buf) { FAR struct nfsmount *nmp; FAR struct nfsnode *np; + int ret; finfo("Buf %p\n", buf); DEBUGASSERT(filep != NULL && buf != NULL); @@ -1178,7 +1203,11 @@ static int nfs_fstat(FAR const struct file *filep, FAR struct stat *buf) memset(buf, 0, sizeof(*buf)); - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } /* Extract the file mode, file type, and file size from the nfsnode * structure. @@ -1210,7 +1239,7 @@ static int nfs_truncate(FAR struct file *filep, off_t length) { FAR struct nfsmount *nmp; FAR struct nfsnode *np; - int error; + int ret; finfo("Truncate to %ld bytes\n", (long)length); DEBUGASSERT(filep->f_priv != NULL && filep->f_inode != NULL); @@ -1222,14 +1251,17 @@ static int nfs_truncate(FAR struct file *filep, off_t length) DEBUGASSERT(nmp != NULL); - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret >= 0) + { + /* Then perform the SETATTR RPC to set the new file size */ - /* Then perform the SETATTR RPC to set the new file size */ + ret = nfs_filetruncate(nmp, np, length); - error = nfs_filetruncate(nmp, np, length); + nfs_semgive(nmp); + } - nfs_semgive(nmp); - return error; + return ret; } /**************************************************************************** @@ -1250,7 +1282,7 @@ static int nfs_opendir(FAR struct inode *mountpt, FAR const char *relpath, FAR struct file_handle fhandle; struct nfs_fattr obj_attributes; uint32_t objtype; - int error; + int ret; finfo("relpath: \"%s\"\n", relpath ? relpath : "NULL"); @@ -1266,14 +1298,18 @@ static int nfs_opendir(FAR struct inode *mountpt, FAR const char *relpath, memset(&dir->u.nfs, 0, sizeof(struct nfsdir_s)); - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } /* Find the NFS node associate with the path */ - error = nfs_findnode(nmp, relpath, &fhandle, &obj_attributes, NULL); - if (error != OK) + ret = nfs_findnode(nmp, relpath, &fhandle, &obj_attributes, NULL); + if (ret != OK) { - ferr("ERROR: nfs_findnode failed: %d\n", error); + ferr("ERROR: nfs_findnode failed: %d\n", ret); goto errout_with_semaphore; } @@ -1283,7 +1319,7 @@ static int nfs_opendir(FAR struct inode *mountpt, FAR const char *relpath, if (objtype != NFDIR) { ferr("ERROR: Not a directory, type=%d\n", objtype); - error = -ENOTDIR; + ret = -ENOTDIR; goto errout_with_semaphore; } @@ -1298,7 +1334,7 @@ static int nfs_opendir(FAR struct inode *mountpt, FAR const char *relpath, errout_with_semaphore: nfs_semgive(nmp); - return error; + return ret; } /**************************************************************************** @@ -1311,7 +1347,8 @@ errout_with_semaphore: * ****************************************************************************/ -static int nfs_readdir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir) +static int nfs_readdir(FAR struct inode *mountpt, + FAR struct fs_dirent_s *dir) { FAR struct nfsmount *nmp; struct file_handle fhandle; @@ -1322,7 +1359,7 @@ static int nfs_readdir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir) FAR uint8_t *name; unsigned int length; int reqlen; - int error = 0; + int ret; finfo("Entry\n"); @@ -1334,7 +1371,11 @@ static int nfs_readdir(FAR struct inode *mountpt, FAR struct fs_dirent_s *dir) nmp = mountpt->i_private; - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } read_dir: /* Request a block directory entries, copying directory information from @@ -1379,12 +1420,12 @@ read_dir: /* And read the directory */ nfs_statistics(NFSPROC_READDIR); - error = nfs_request(nmp, NFSPROC_READDIR, - (FAR void *)&nmp->nm_msgbuffer.readdir, reqlen, - (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); - if (error != OK) + ret = nfs_request(nmp, NFSPROC_READDIR, + (FAR void *)&nmp->nm_msgbuffer.readdir, reqlen, + (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); + if (ret != OK) { - ferr("ERROR: nfs_request failed: %d\n", error); + ferr("ERROR: nfs_request failed: %d\n", ret); goto errout_with_semaphore; } @@ -1398,7 +1439,8 @@ read_dir: * 4) Values follows indication - 4 bytes */ - ptr = (FAR uint32_t *)&((FAR struct rpc_reply_readdir *)nmp->nm_iobuffer)->readdir; + ptr = (FAR uint32_t *) + &((FAR struct rpc_reply_readdir *)nmp->nm_iobuffer)->readdir; /* Check if attributes follow, if 0 so Skip over the attributes */ @@ -1431,7 +1473,7 @@ next_entry: if (tmp != 0) { finfo("End of directory\n"); - error = -ENOENT; + ret = -ENOENT; goto errout_with_semaphore; } @@ -1501,10 +1543,10 @@ next_entry: fhandle.length = (uint32_t)dir->u.nfs.nfs_fhsize; memcpy(&fhandle.handle, dir->u.nfs.nfs_fhandle, fhandle.length); - error = nfs_lookup(nmp, dir->fd_dir.d_name, &fhandle, &obj_attributes, NULL); - if (error != OK) + ret = nfs_lookup(nmp, dir->fd_dir.d_name, &fhandle, &obj_attributes, NULL); + if (ret != OK) { - ferr("ERROR: nfs_lookup failed: %d\n", error); + ferr("ERROR: nfs_lookup failed: %d\n", ret); goto errout_with_semaphore; } @@ -1550,7 +1592,7 @@ next_entry: errout_with_semaphore: nfs_semgive(nmp); - return error; + return ret; } /**************************************************************************** @@ -1738,7 +1780,7 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data, struct nfs_mount_parameters nprmt; uint32_t buflen; uint32_t tmp; - int error = 0; + int ret = 0; DEBUGASSERT(data && handle); @@ -1805,11 +1847,12 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data, /* Initialize the allocated mountpt state structure. */ /* Initialize the semaphore that controls access. The initial count - * is zero, but nfs_semgive() is called at the completion of initialization, - * incrementing the count to one. + * is zero, but nfs_semgive() is called at the completion of + * initialization, incrementing the count to one. */ - nxsem_init(&nmp->nm_sem, 0, 0); /* Initialize the semaphore that controls access */ + nxsem_init(&nmp->nm_sem, 0, 0); /* Initialize the semaphore that + * controls access */ /* Initialize NFS */ @@ -1849,10 +1892,10 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data, nmp->nm_rpcclnt = rpc; - error = rpcclnt_connect(nmp->nm_rpcclnt); - if (error != OK) + ret = rpcclnt_connect(nmp->nm_rpcclnt); + if (ret != OK) { - ferr("ERROR: nfs_connect failed: %d\n", error); + ferr("ERROR: nfs_connect failed: %d\n", ret); goto bad; } @@ -1861,10 +1904,10 @@ static int nfs_bind(FAR struct inode *blkdriver, FAR const void *data, /* Get the file sytem info */ - error = nfs_fsinfo(nmp); - if (error) + ret = nfs_fsinfo(nmp); + if (ret) { - ferr("ERROR: nfs_fsinfo failed: %d\n", error); + ferr("ERROR: nfs_fsinfo failed: %d\n", ret); goto bad; } @@ -1891,7 +1934,7 @@ bad: nxsem_destroy(&nmp->nm_sem); kmm_free(nmp); - return error; + return ret; } /**************************************************************************** @@ -1909,19 +1952,23 @@ static int nfs_unbind(FAR void *handle, FAR struct inode **blkdriver, unsigned int flags) { FAR struct nfsmount *nmp = (FAR struct nfsmount *)handle; - int error; + int ret; finfo("Entry\n"); DEBUGASSERT(nmp); /* Get exclusive access to the mount structure */ - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } - /* Are there any open files? We can tell if there are open files by looking - * at the list of file structures in the mount structure. If this list - * not empty, then there are open files and we cannot unmount now (or a - * crash is sure to follow). + /* Are there any open files? We can tell if there are open files by + * looking at the list of file structures in the mount structure. If this + * list not empty, then there are open files and we cannot unmount now (or + * a crash is sure to follow). */ if (nmp->nm_head != NULL) @@ -1932,7 +1979,7 @@ static int nfs_unbind(FAR void *handle, FAR struct inode **blkdriver, * no open file references. */ - error = (flags != 0) ? -ENOSYS : -EBUSY; + ret = (flags != 0) ? -ENOSYS : -EBUSY; goto errout_with_semaphore; } @@ -1950,7 +1997,7 @@ static int nfs_unbind(FAR void *handle, FAR struct inode **blkdriver, errout_with_semaphore: nfs_semgive(nmp); - return error; + return ret; } /**************************************************************************** @@ -1974,7 +2021,7 @@ static int nfs_fsinfo(FAR struct nfsmount *nmp) FAR uint32_t *ptr; uint32_t pref; uint32_t max; - int error = 0; + int ret = 0; fsinfo = &nmp->nm_msgbuffer.fsinfo; fsinfo->fs.fsroot.length = txdr_unsigned(nmp->nm_fhsize); @@ -1983,17 +2030,18 @@ static int nfs_fsinfo(FAR struct nfsmount *nmp) /* Request FSINFO from the server */ nfs_statistics(NFSPROC_FSINFO); - error = nfs_request(nmp, NFSPROC_FSINFO, - (FAR void *)fsinfo, sizeof(struct FS3args), - (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); - if (error) + ret = nfs_request(nmp, NFSPROC_FSINFO, + (FAR void *)fsinfo, sizeof(struct FS3args), + (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); + if (ret) { - return error; + return ret; } /* Save the root file system attributes */ - ptr = (FAR uint32_t *)&((FAR struct rpc_reply_fsinfo *)nmp->nm_iobuffer)->fsinfo; + ptr = (FAR uint32_t *) + &((FAR struct rpc_reply_fsinfo *)nmp->nm_iobuffer)->fsinfo; if (*ptr++ != 0) { memcpy(&nmp->nm_fattr, ptr, sizeof(struct nfs_fattr)); @@ -2048,12 +2096,12 @@ static int nfs_fsinfo(FAR struct nfsmount *nmp) if (nmp->nm_fattr.fa_type == 0) { nfs_statistics(NFSPROC_GETATTR); - error = nfs_request(nmp, NFSPROC_GETATTR, - (FAR void *)fsinfo, sizeof(struct FS3args), - (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); - if (error) + ret = nfs_request(nmp, NFSPROC_GETATTR, + (FAR void *)fsinfo, sizeof(struct FS3args), + (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); + if (ret) { - return error; + return ret; } attr = (FAR struct rpc_reply_getattr *)nmp->nm_iobuffer; @@ -2079,8 +2127,8 @@ static int nfs_statfs(FAR struct inode *mountpt, FAR struct statfs *sbp) FAR struct nfsmount *nmp; FAR struct rpc_call_fs *fsstat; FAR struct rpc_reply_fsstat *sfp; - int error = 0; uint64_t tquad; + int ret; /* Sanity checks */ @@ -2090,7 +2138,11 @@ static int nfs_statfs(FAR struct inode *mountpt, FAR struct statfs *sbp) nmp = (FAR struct nfsmount *)mountpt->i_private; - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } /* Fill in the statfs info */ @@ -2101,10 +2153,10 @@ static int nfs_statfs(FAR struct inode *mountpt, FAR struct statfs *sbp) memcpy(&fsstat->fs.fsroot.handle, nmp->nm_fh, nmp->nm_fhsize); nfs_statistics(NFSPROC_FSSTAT); - error = nfs_request(nmp, NFSPROC_FSSTAT, - (FAR void *)fsstat, sizeof(struct FS3args), - (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); - if (error) + ret = nfs_request(nmp, NFSPROC_FSSTAT, + (FAR void *)fsstat, sizeof(struct FS3args), + (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); + if (ret) { goto errout_with_semaphore; } @@ -2125,7 +2177,7 @@ static int nfs_statfs(FAR struct inode *mountpt, FAR struct statfs *sbp) errout_with_semaphore: nfs_semgive(nmp); - return error; + return ret; } /**************************************************************************** @@ -2148,7 +2200,7 @@ static int nfs_remove(FAR struct inode *mountpt, FAR const char *relpath) FAR uint32_t *ptr; int namelen; int reqlen; - int error; + int ret; /* Sanity checks */ @@ -2158,14 +2210,18 @@ static int nfs_remove(FAR struct inode *mountpt, FAR const char *relpath) nmp = (FAR struct nfsmount *)mountpt->i_private; - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } /* Find the NFS node of the directory containing the file to be deleted */ - error = nfs_finddir(nmp, relpath, &fhandle, &fattr, filename); - if (error != OK) + ret = nfs_finddir(nmp, relpath, &fhandle, &fattr, filename); + if (ret != OK) { - ferr("ERROR: nfs_finddir returned: %d\n", error); + ferr("ERROR: nfs_finddir returned: %d\n", ret); goto errout_with_semaphore; } @@ -2196,13 +2252,13 @@ static int nfs_remove(FAR struct inode *mountpt, FAR const char *relpath) /* Perform the REMOVE RPC call */ nfs_statistics(NFSPROC_REMOVE); - error = nfs_request(nmp, NFSPROC_REMOVE, - (FAR void *)&nmp->nm_msgbuffer.removef, reqlen, - (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); + ret = nfs_request(nmp, NFSPROC_REMOVE, + (FAR void *)&nmp->nm_msgbuffer.removef, reqlen, + (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); errout_with_semaphore: nfs_semgive(nmp); - return error; + return ret; } /**************************************************************************** @@ -2227,7 +2283,7 @@ static int nfs_mkdir(FAR struct inode *mountpt, FAR const char *relpath, uint32_t tmp; int namelen; int reqlen; - int error; + int ret; /* Sanity checks */ @@ -2237,14 +2293,18 @@ static int nfs_mkdir(FAR struct inode *mountpt, FAR const char *relpath, nmp = (FAR struct nfsmount *) mountpt->i_private; - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } /* Find the NFS node of the directory containing the directory to be created */ - error = nfs_finddir(nmp, relpath, &fhandle, &fattr, dirname); - if (error != OK) + ret = nfs_finddir(nmp, relpath, &fhandle, &fattr, dirname); + if (ret != OK) { - ferr("ERROR: nfs_finddir returned: %d\n", error); + ferr("ERROR: nfs_finddir returned: %d\n", ret); goto errout_with_semaphore; } @@ -2313,17 +2373,17 @@ static int nfs_mkdir(FAR struct inode *mountpt, FAR const char *relpath, /* Perform the MKDIR RPC */ nfs_statistics(NFSPROC_MKDIR); - error = nfs_request(nmp, NFSPROC_MKDIR, - (FAR void *)&nmp->nm_msgbuffer.mkdir, reqlen, - (FAR void *)&nmp->nm_iobuffer, nmp->nm_buflen); - if (error) + ret = nfs_request(nmp, NFSPROC_MKDIR, + (FAR void *)&nmp->nm_msgbuffer.mkdir, reqlen, + (FAR void *)&nmp->nm_iobuffer, nmp->nm_buflen); + if (ret) { - ferr("ERROR: nfs_request failed: %d\n", error); + ferr("ERROR: nfs_request failed: %d\n", ret); } errout_with_semaphore: nfs_semgive(nmp); - return error; + return ret; } /**************************************************************************** @@ -2346,7 +2406,7 @@ static int nfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath) FAR uint32_t *ptr; int namelen; int reqlen; - int error; + int ret; /* Sanity checks */ @@ -2356,14 +2416,18 @@ static int nfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath) nmp = (FAR struct nfsmount *)mountpt->i_private; - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } /* Find the NFS node of the directory containing the directory to be removed */ - error = nfs_finddir(nmp, relpath, &fhandle, &fattr, dirname); - if (error != OK) + ret = nfs_finddir(nmp, relpath, &fhandle, &fattr, dirname); + if (ret != OK) { - ferr("ERROR: nfs_finddir returned: %d\n", error); + ferr("ERROR: nfs_finddir returned: %d\n", ret); goto errout_with_semaphore; } @@ -2394,13 +2458,13 @@ static int nfs_rmdir(FAR struct inode *mountpt, FAR const char *relpath) /* Perform the RMDIR RPC */ nfs_statistics(NFSPROC_RMDIR); - error = nfs_request(nmp, NFSPROC_RMDIR, - (FAR void *)&nmp->nm_msgbuffer.rmdir, reqlen, - (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); + ret = nfs_request(nmp, NFSPROC_RMDIR, + (FAR void *)&nmp->nm_msgbuffer.rmdir, reqlen, + (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); errout_with_semaphore: nfs_semgive(nmp); - return error; + return ret; } /**************************************************************************** @@ -2426,7 +2490,7 @@ static int nfs_rename(FAR struct inode *mountpt, FAR const char *oldrelpath, FAR uint32_t *ptr; int namelen; int reqlen; - int error; + int ret; /* Sanity checks */ @@ -2436,23 +2500,27 @@ static int nfs_rename(FAR struct inode *mountpt, FAR const char *oldrelpath, nmp = (FAR struct nfsmount *)mountpt->i_private; - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } /* Find the NFS node of the directory containing the 'from' object */ - error = nfs_finddir(nmp, oldrelpath, &from_handle, &fattr, from_name); - if (error != OK) + ret = nfs_finddir(nmp, oldrelpath, &from_handle, &fattr, from_name); + if (ret != OK) { - ferr("ERROR: nfs_finddir returned: %d\n", error); + ferr("ERROR: nfs_finddir returned: %d\n", ret); goto errout_with_semaphore; } /* Find the NFS node of the directory containing the 'to' object */ - error = nfs_finddir(nmp, newrelpath, &to_handle, &fattr, to_name); - if (error != OK) + ret = nfs_finddir(nmp, newrelpath, &to_handle, &fattr, to_name); + if (ret != OK) { - ferr("ERROR: nfs_finddir returned: %d\n", error); + ferr("ERROR: nfs_finddir returned: %d\n", ret); goto errout_with_semaphore; } @@ -2503,13 +2571,13 @@ static int nfs_rename(FAR struct inode *mountpt, FAR const char *oldrelpath, /* Perform the RENAME RPC */ nfs_statistics(NFSPROC_RENAME); - error = nfs_request(nmp, NFSPROC_RENAME, - (FAR void *)&nmp->nm_msgbuffer.renamef, reqlen, - (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); + ret = nfs_request(nmp, NFSPROC_RENAME, + (FAR void *)&nmp->nm_msgbuffer.renamef, reqlen, + (FAR void *)nmp->nm_iobuffer, nmp->nm_buflen); errout_with_semaphore: nfs_semgive(nmp); - return error; + return ret; } /**************************************************************************** @@ -2592,7 +2660,7 @@ static int nfs_stat(FAR struct inode *mountpt, FAR const char *relpath, struct file_handle fhandle; struct nfs_fattr attributes; struct timespec ts; - int error; + int ret; /* Sanity checks */ @@ -2605,14 +2673,18 @@ static int nfs_stat(FAR struct inode *mountpt, FAR const char *relpath, memset(buf, 0, sizeof(*buf)); - nfs_semtake(nmp); + ret = nfs_semtake(nmp); + if (ret < 0) + { + return ret; + } /* Get the file handle attributes of the requested node */ - error = nfs_findnode(nmp, relpath, &fhandle, &attributes, NULL); - if (error != OK) + ret = nfs_findnode(nmp, relpath, &fhandle, &attributes, NULL); + if (ret != OK) { - ferr("ERROR: nfs_findnode failed: %d\n", error); + ferr("ERROR: nfs_findnode failed: %d\n", ret); goto errout_with_semaphore; } @@ -2635,5 +2707,5 @@ static int nfs_stat(FAR struct inode *mountpt, FAR const char *relpath, errout_with_semaphore: nfs_semgive(nmp); - return error; + return ret; } diff --git a/fs/semaphore/sem_close.c b/fs/semaphore/sem_close.c index a916844cdf..6af2097785 100644 --- a/fs/semaphore/sem_close.c +++ b/fs/semaphore/sem_close.c @@ -81,16 +81,17 @@ int sem_close(FAR sem_t *sem) /* Decrement the reference count on the inode */ - ret = inode_semtake(); - if (ret < 0) + do { - /* REVISIT: This failure is probably -ECANCELED meaning that the - * thread was canceled. In this case, the semaphore will not be - * closed. + ret = inode_semtake(); + + /* The only error that is expected is due to thread cancellation. + * At this point, we must continue to free the semaphore anyway. */ - return ret; + DEBUGASSERT(ret == OK || ret == -ECANCELED); } + while (ret < 0); if (inode->i_crefs > 0) {