!385 SIOCGIFCONF iotcl，用户态到内核态申请内存大小错误

Merge pull request !385 from 刘建东/cherry-pick-1625021431

.gitee/ISSUE_TEMPLATE.zh-CN.md

@@ -0,0 +1,11 @@
+### 该问题是怎么引起的？
+
+
+
+### 重现步骤
+
+
+
+### 报错信息
+    
+    

.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md

@@ -0,0 +1,12 @@
+### 相关的Issue
+    
+    
+### 原因（目的、解决的问题等）
+
+
+### 描述（做了什么，变更了什么）
+
+
+### 测试用例（新增、改动、可能影响的功能）
+    
+    

apps/config.mk

@@ -37,7 +37,7 @@ LIBSOUT := $(OBJOUT)/libs
 IMGOUT  := $(OUT)
 
 # common flags config
-BASE_OPTS := -ffunction-sections -fdata-sections -fno-omit-frame-pointer -D_GNU_SOURCE \
+BASE_OPTS := -ffunction-sections -fdata-sections -fno-omit-frame-pointer -fno-common -fno-strict-aliasing -D_GNU_SOURCE \
              $(LITEOS_SSP) $(LITEOS_CORE_COPTS) $(WARNING_AS_ERROR) $(LLVM_EXTRA_OPTS) $(LITEOS_GCOV_OPTS)
 
 CFLAGS := -std=c99 -fno-exceptions $(BASE_OPTS) $(LITEOS_COPTS_OPTMIZE)

arch/arm/arm/src/los_exc.c

@@ -669,12 +669,21 @@ VOID BackTraceSub(UINTPTR regFP)
 
     while (IsValidFP(backFP, stackStart, stackEnd, &kvaddr) == TRUE) {
         tmpFP = backFP;
+#ifdef LOSCFG_COMPILER_CLANG_LLVM
+        backFP = *(UINTPTR *)(UINTPTR)kvaddr;
+        if (IsValidFP(tmpFP + POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) {
+            PrintExcInfo("traceback backLR check failed, backLP: 0x%x\n", tmpFP + POINTER_SIZE);
+            return;
+        }
+        backLR = *(UINTPTR *)(UINTPTR)kvaddr;
+#else
         backLR = *(UINTPTR *)(UINTPTR)kvaddr;
         if (IsValidFP(tmpFP - POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) {
             PrintExcInfo("traceback backFP check failed, backFP: 0x%x\n", tmpFP - POINTER_SIZE);
             return;
         }
         backFP = *(UINTPTR *)(UINTPTR)kvaddr;
+#endif
         if (LOS_IsUserAddress((VADDR_T)backLR) == TRUE) {
             region = LOS_RegionFind(OsCurrProcessGet()->vmSpace, (VADDR_T)backLR);
         }

arch/arm/arm/src/startup/reset_vector_mp.S

@@ -65,7 +65,9 @@
 
     .equ MPIDR_CPUID_MASK, 0xffU
 
-    .fpu vfpv4
+    .fpu neon-vfpv4
+    .syntax unified
+    .arch armv7-a
     .arm
 
 /* param0 is stack bottom, param1 is stack size, r12 hold cpu id */
@@ -187,7 +189,7 @@ reloc_img_to_bottom_done:
     mov     r0, r4
     mov     r1, #0
     mov     r2, #MMU_DESCRIPTOR_L1_SMALL_ENTRY_NUMBERS
-    bl      memset
+    bl      memset_optimized                    /* optimized memset since r0 is 64-byte aligned */
 
     PAGE_TABLE_SET SYS_MEM_BASE, KERNEL_VMM_BASE, KERNEL_VMM_SIZE, MMU_DESCRIPTOR_KERNEL_L1_PTE_FLAGS
     PAGE_TABLE_SET SYS_MEM_BASE, UNCACHED_VMM_BASE, UNCACHED_VMM_SIZE, MMU_INITIAL_MAP_NORMAL_NOCACHE
@@ -463,6 +465,18 @@ _bootaddr_setup:
 
     bx      lr
 
+memset_optimized:
+    mov     r3, r0
+    vdup.8  q0, r1
+    vmov    q1, q0
+    vmov    q2, q0
+    vmov    q3, q0
+memset_optimized_loop:
+    subs    r2, #64
+    vstmia  r3!, {d0 - d7}
+    bge     memset_optimized_loop
+    bx      lr
+
 init_done:
     .long  0xDEADB00B
 

arch/arm/arm/src/startup/reset_vector_up.S

@@ -65,7 +65,9 @@
 
     .equ MPIDR_CPUID_MASK, 0xffU
 
-    .fpu vfpv4
+    .fpu neon-vfpv4
+    .syntax unified
+    .arch armv7-a
     .arm
 
 /* param0 is stack bottom, param1 is stack size, r11 hold cpu id */
@@ -164,7 +166,7 @@ reloc_img_to_bottom_done:
     mov     r0, r4
     mov     r1, #0
     mov     r2, #MMU_DESCRIPTOR_L1_SMALL_ENTRY_NUMBERS
-    bl      memset
+    bl      memset_optimized                    /* optimized memset since r0 is 64-byte aligned */
 
 
     PAGE_TABLE_SET SYS_MEM_BASE, KERNEL_VMM_BASE, KERNEL_VMM_SIZE, MMU_DESCRIPTOR_KERNEL_L1_PTE_FLAGS
@@ -431,6 +433,18 @@ _bootaddr_setup:
 
     bx      lr
 
+memset_optimized:
+    mov     r3, r0
+    vdup.8  q0, r1
+    vmov    q1, q0
+    vmov    q2, q0
+    vmov    q3, q0
+memset_optimized_loop:
+    subs    r2, #64
+    vstmia  r3!, {d0 - d7}
+    bge     memset_optimized_loop
+    bx      lr
+
 init_done:
     .long  0xDEADB00B
 

build.sh

@@ -38,22 +38,22 @@ outdir="../..$3/test_info/gen/kernel/test"
 if [ "$5" = "tee" ]; then
     tee="_tee"
 fi
-productName="$(basename $7)"
-source="tools/build/config/${productName}_release.config"
+product_name="$(basename $7)"
+source="tools/build/config/${product_name}_release.config"
 if [ "$2" = "clang" ]; then
     if [ "$4" = "debug" ]; then
-        config_file="${productName}_$2$tee.config"
+        config_file="${product_name}_$2$tee.config"
         source="tools/build/config/debug/$config_file"
     else
-        config_file="${productName}_$2_release$tee.config"
+        config_file="${product_name}_$2_release$tee.config"
         source="tools/build/config/$config_file"
     fi
 elif [ "$2" = "gcc" ]; then
     if [ "$4" = "debug" ]; then
-        config_file="${productName}_debug_shell$tee.config"
+        config_file="${product_name}_debug_shell$tee.config"
         source="tools/build/config/$config_file"
     else
-        config_file="${productName}_release$tee.config"
+        config_file="${product_name}_release$tee.config"
         source="tools/build/config/$config_file"
     fi
 fi

compat/posix/src/time.c

@@ -586,6 +586,7 @@ typedef struct {
 
 static VOID SwtmrProc(UINTPTR tmrArg)
 {
+    unsigned int intSave;
     int sig;
     pid_t pid;
     siginfo_t info;
@@ -610,7 +611,10 @@ static VOID SwtmrProc(UINTPTR tmrArg)
     info.si_value.sival_ptr = arg->sigev_value.sival_ptr;
 
     /* Send the signal */
+    SCHEDULER_LOCK(intSave);
     OsDispatch(pid, &info, OS_USER_KILL_PERMISSION);
+    SCHEDULER_UNLOCK(intSave);
+
     return;
 }
 
@@ -883,8 +887,10 @@ clock_t times(struct tms *buf)
 
 int setitimer(int which, const struct itimerval *value, struct itimerval *ovalue)
 {
+    UINT32 intSave;
     LosTaskCB *taskCB = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
     LosProcessCB *processCB = OS_PCB_FROM_PID(taskCB->processID);
+    timer_t timerID = 0;
     struct itimerspec spec;
     struct itimerspec ospec;
     int ret = LOS_OK;
@@ -894,15 +900,27 @@ int setitimer(int which, const struct itimerval *value, struct itimerval *ovalue
         set_errno(EINVAL);
         return -1;
     }
-    LOS_TaskLock();
+
     if (processCB->timerID == (timer_t)(UINTPTR)MAX_INVALID_TIMER_VID) {
-        ret = timer_create(CLOCK_REALTIME, NULL, &processCB->timerID);
+        ret = timer_create(CLOCK_REALTIME, NULL, &timerID);
         if (ret != LOS_OK) {
-            LOS_TaskUnlock();
             return ret;
         }
     }
-    LOS_TaskUnlock();
+
+    /* The initialization of this global timer must be in spinlock
+     * timer_create cannot be located in spinlock.
+     */
+    SCHEDULER_LOCK(intSave);
+    if (processCB->timerID == (timer_t)(UINTPTR)MAX_INVALID_TIMER_VID) {
+        processCB->timerID = timerID;
+        SCHEDULER_UNLOCK(intSave);
+    } else {
+        SCHEDULER_UNLOCK(intSave);
+        if (timerID) {
+            timer_delete(timerID);
+        }
+    }
 
     if (!ValidTimeval(&value->it_value) || !ValidTimeval(&value->it_interval)) {
         set_errno(EINVAL);

fs/vfs/operation/fs_other.c

@@ -526,16 +526,74 @@ static void PrintFileInfo(const struct stat *statInfo, const char *name)
            str[0], str[1], str[UGO_NUMS - 1], statInfo->st_size, statInfo->st_uid, statInfo->st_gid, name);
 }
 
-void ls(const char *pathname)
+int LsFile(const char *path)
 {
-    struct stat64 stat64_info;
-    struct stat stat_info;
-    struct dirent *pdirent = NULL;
-    char *path = NULL;
+    struct stat64 stat64Info;
+    struct stat statInfo;
+
+    if (stat64(path, &stat64Info) == 0) {
+        PrintFileInfo64(&stat64Info, path);
+    } else if (stat(path, &statInfo) == 0) {
+        PrintFileInfo(&statInfo, path);
+    } else {
+        return -1;
+    }
+
+    return 0;
+}
+
+int LsDir(const char *path)
+{
+    struct stat statInfo = { 0 };
+    struct stat64 stat64Info = { 0 };
+    DIR *d = NULL;
     char *fullpath = NULL;
     char *fullpath_bak = NULL;
+    struct dirent *pdirent = NULL;
+
+    d = opendir(path);
+    if (d == NULL) {
+        return -1;
+    }
+
+    PRINTK("Directory %s:\n", path);
+    do {
+        pdirent = readdir(d);
+        if (pdirent == NULL) {
+            break;
+        } else {
+            if (!strcmp(pdirent->d_name, ".") || !strcmp(pdirent->d_name, "..")) {
+                continue;
+            }
+            (void)memset_s(&statInfo, sizeof(struct stat), 0, sizeof(struct stat));
+            (void)memset_s(&stat64Info, sizeof(struct stat), 0, sizeof(struct stat));
+            fullpath = ls_get_fullpath(path, pdirent);
+            if (fullpath == NULL) {
+                (void)closedir(d);
+                return -1;
+            }
+
+            fullpath_bak = fullpath;
+            if (stat64(fullpath, &stat64Info) == 0) {
+                PrintFileInfo64(&stat64Info, pdirent->d_name);
+            } else if (stat(fullpath, &statInfo) == 0) {
+                PrintFileInfo(&statInfo, pdirent->d_name);
+            } else {
+                PRINTK("BAD file: %s\n", pdirent->d_name);
+            }
+            free(fullpath_bak);
+        }
+    } while (1);
+    (void)closedir(d);
+
+    return 0;
+}
+
+void ls(const char *pathname)
+{
+    struct stat statInfo = { 0 };
+    char *path = NULL;
     int ret;
-    DIR *d = NULL;
 
     if (pathname == NULL) {
 #ifdef VFS_USING_WORKDIR
@@ -561,45 +619,23 @@ void ls(const char *pathname)
         }
     }
 
-    /* list all directory and file*/
-
-    d = opendir(path);
-    if (d == NULL) {
+    ret = stat(path, &statInfo);
+    if (ret < 0) {
         perror("ls error");
-    } else {
-        PRINTK("Directory %s:\n", path);
-        do {
-            pdirent = readdir(d);
-            if (pdirent == NULL) {
-                break;
-            } else {
-                if (!strcmp(pdirent->d_name, ".") || !strcmp(pdirent->d_name, "..")) {
-                    continue;
-                }
-                (void)memset_s(&stat_info, sizeof(struct stat), 0, sizeof(struct stat));
-                fullpath = ls_get_fullpath(path, pdirent);
-                if (fullpath == NULL) {
-                    free(path);
-                    (void)closedir(d);
-                    return;
-                }
-
-                fullpath_bak = fullpath;
-
-                if (stat64(fullpath, &stat64_info) == 0) {
-                    PrintFileInfo64(&stat64_info, pdirent->d_name);
-                } else if (stat(fullpath, &stat_info) == 0) {
-                    PrintFileInfo(&stat_info, pdirent->d_name);
-                } else
-                    PRINTK("BAD file: %s\n", pdirent->d_name);
-                free(fullpath_bak);
-            }
-        } while (1);
-
-        (void)closedir(d);
+        free(path);
+        return;
     }
-    free(path);
 
+    if (statInfo.st_mode & S_IFDIR) { /* list all directory and file */
+        ret = LsDir((pathname == NULL) ? path : pathname);
+    } else { /* show the file infomation */
+        ret = LsFile(path);
+    }
+    if (ret < 0) {
+        perror("ls error");
+    }
+
+    free(path);
     return;
 }
 

kernel/base/ipc/los_signal.c

@@ -510,7 +510,6 @@ int OsSigSuspend(const sigset_t *set)
 {
     unsigned int intSave;
     LosTaskCB *rtcb = NULL;
-    unsigned int sigTempProcMask;
     sigset_t setSuspend;
     int ret;
 
@@ -519,7 +518,6 @@ int OsSigSuspend(const sigset_t *set)
     }
     SCHEDULER_LOCK(intSave);
     rtcb = OsCurrTaskGet();
-    sigTempProcMask = rtcb->sig.sigprocmask;
 
     /* Wait signal calc */
     setSuspend = FULL_SIGNAL_SET & (~(*set));
@@ -530,8 +528,6 @@ int OsSigSuspend(const sigset_t *set)
     if (ret < 0) {
         PRINT_ERR("FUNC %s LINE = %d, ret = %x\n", __FUNCTION__, __LINE__, ret);
     }
-    /* Restore old sigprocmask */
-    OsSigMaskSwitch(rtcb, sigTempProcMask);
 
     SCHEDULER_UNLOCK(intSave);
     return -EINTR;

kernel/base/sched/sched_sq/los_sched.c

@@ -63,7 +63,7 @@ extern "C" {
 #define OS_SCHED_TIME_SLICES_MAX   ((LOSCFG_BASE_CORE_TIMESLICE_TIMEOUT * OS_SYS_NS_PER_US) / OS_NS_PER_CYCLE)
 #define OS_SCHED_TIME_SLICES_DIFF  (OS_SCHED_TIME_SLICES_MAX - OS_SCHED_TIME_SLICES_MIN)
 #define OS_SCHED_READY_MAX         30
-#define OS_TIME_SLICE_MIN          ((50 * OS_SYS_NS_PER_US) / OS_NS_PER_CYCLE) /* 50us */
+#define OS_TIME_SLICE_MIN          (INT32)((50 * OS_SYS_NS_PER_US) / OS_NS_PER_CYCLE) /* 50us */
 #define OS_SCHED_MAX_RESPONSE_TIME (UINT64)(OS_64BIT_MAX - 1U)
 
 typedef struct {

kernel/extended/vdso/usr/Makefile

@@ -37,7 +37,8 @@ VDSO_INCLUDE := -I $(LITEOSTOPDIR)/kernel/extended/vdso/include \
                 -I $(LITEOSTOPDIR)/kernel/common \
                 -I $(LITEOSTOPDIR)/bsd/compat/linuxkpi/include
 
-VDSO_CCFLAGS := -nostdlib -fPIC $(LITEOS_SSP) $(LITEOS_CORE_COPTS) $(WARNING_AS_ERROR) $(LITEOS_COPTS_OPTMIZE)
+VDSO_CCFLAGS := -nostdlib -fPIC -fno-common -fno-strict-aliasing \
+                $(LITEOS_SSP) $(LITEOS_CORE_COPTS) $(WARNING_AS_ERROR) $(LITEOS_COPTS_OPTMIZE)
 ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
 VDSO_CCFLAGS += $(LLVM_EXTRA_OPTS) --sysroot=$(LITEOSTOPDIR)/../../prebuilts/lite/sysroot/
 endif

net/lwip-2.1/porting/src/sockets.c

@@ -1468,6 +1468,51 @@ static err_t lwip_do_ioctl_impl(struct tcpip_api_call_data *call)
 
 #include "los_vm_map.h"
 #include "user_copy.h"
+static int do_ioctl_SIOCGIFCONF(int sockfd, long cmd, void *argp)
+{
+    int nbytes;
+    struct ifconf ifc;
+    char *buf_bak = NULL;
+    int ret;
+
+    if (LOS_ArchCopyFromUser(&ifc, argp, sizeof(struct ifconf)) != 0) {
+        set_errno(EFAULT);
+        return -1;
+    }
+    nbytes = ifc.ifc_len;
+    if (nbytes < 0) {
+        set_errno(EINVAL);
+        return -1;
+    }
+    buf_bak = ifc.ifc_buf;
+    if (!LOS_IsUserAddress((VADDR_T)(uintptr_t)buf_bak)) {
+        set_errno(EFAULT);
+        return -1;
+    }
+    ifc.ifc_buf = malloc(nbytes);
+    if (ifc.ifc_buf == NULL) {
+        set_errno(ENOMEM);
+        return -1;
+    }
+    (void)memset_s(ifc.ifc_buf, nbytes, 0, nbytes);
+
+    ret = lwip_ioctl(sockfd, cmd, &ifc);
+    if (ret == 0) {
+        if (LOS_ArchCopyToUser(buf_bak, ifc.ifc_buf, nbytes) != 0) {
+            set_errno(EFAULT);
+            ret = -1;
+        }
+    }
+
+    free(ifc.ifc_buf);
+    ifc.ifc_buf = buf_bak;
+    if (LOS_ArchCopyToUser(argp, &ifc, sizeof(struct ifconf)) != 0) {
+        set_errno(EFAULT);
+        ret = -1;
+    }
+    return ret;
+}
+
 int socks_ioctl(int sockfd, long cmd, void *argp)
 {
     void *argpbak = argp;
@@ -1483,11 +1528,12 @@ int socks_ioctl(int sockfd, long cmd, void *argp)
             case SIOCADDRT:
                 nbytes = sizeof(struct rtentry);
                 break;
+            case SIOCGIFCONF:
+                return do_ioctl_SIOCGIFCONF(sockfd, cmd, argp);
             case SIOCSIPV6DAD:
             case SIOCGIPV6DAD:
             case SIOCSIPV6DPCTD:
             case SIOCGIPV6DPCTD:
-            case SIOCGIFCONF:
             case SIOCGIFADDR:
             case SIOCSIFADDR:
             case SIOCDIFADDR:

tools/build/mk/los_config.mk

@@ -359,13 +359,13 @@ ifeq ($(LOSCFG_NET_LWIP_SACK_2_1), y)
 
     LITEOS_CMACRO     +=  $(LWIP_MACROS)
 else ifeq ($(LOSCFG_NET_LWIP_SACK_2_0), y)
-    LWIPDIR := $(LITEOSTHIRDPARTY)/lwip_enhanced
+    LWIPDIR := $(LITEOSTHIRDPARTY)/lwip_enhanced/src
     LITEOS_BASELIB += -llwip
     LIB_SUBDIRS       += $(LWIPDIR)
     LITEOS_LWIP_SACK_INCLUDE   += \
         -I $(LWIPDIR)/include \
         -I $(LITEOSTOPDIR)/net/mac
-    LWIP_MACROS += -DLWIP_CONFIG_FILE=\"lwip/lwipopts.h\"
+    LWIP_MACROS += -DLWIP_CONFIG_FILE=\"lwip/lwipopts.h\" -DLWIP_LITEOS_A_COMPAT
     LITEOS_CMACRO     +=  $(LWIP_MACROS)
 else
     $(error "unknown lwip version")