p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: A核告警消除 

【背景】定期A核代码消除。

【修改方案】
1，根据工具扫描结果，对代码告警进行更改

【影响】
对现有的产品编译不会有影响。

re #I46KF6
Signed-off-by: wangchen <253227059@qq.com>
This commit is contained in:
wangchen 2021-08-20 16:41:11 +08:00
parent 40297a6dbc
commit d16bfd005a
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/proc/os_adapt/fd_proc.c
View File

@ -75,7 +75,7 @@ static void FillFdInfo(struct SeqBuf *seqBuf, struct filelist *fileList, unsigne
}
if (hasPrivilege) {
(void)LosBufPrintf(seqBuf, "%u\t%d\t%6d <%d>\t%s\n", pid, fd, sysFd, filp->f_refcount, name);
(void)LosBufPrintf(seqBuf, "%u\t%d\t%6d <%d>\t%s\n", pid, fd, sysFd, filp ? filp->f_refcount : 1, name);
} else {
(void)LosBufPrintf(seqBuf, "%u\t%d\t%s\n", pid, fd, name);
}

5
fs/vfs/operation/vfs_cloexec.c
View File

@ -50,7 +50,10 @@ void CloseOnExec(struct files_struct *files)
if (FD_ISSET(i, files->fdt->proc_fds) &&
FD_ISSET(i, files->fdt->cloexec_fds)) {
sysFd = DisassociateProcessFd(i);
close(sysFd);
if (sysFd >= 0) {
close(sysFd);
}
FreeProcessFd(i);
}
}

8
fs/vfs/operation/vfs_force_umount.c
View File

@ -265,6 +265,10 @@ static struct Mount* GetDevMountPoint(struct Vnode *dev)
{
struct Mount *mnt = NULL;
LIST_HEAD *mntList = GetMountList();
if (mntList == NULL) {
return NULL;
}
LOS_DL_LIST_FOR_EACH_ENTRY(mnt, mntList, struct Mount, mountList) {
if (mnt->vnodeDev == dev) {
return mnt;
@ -302,7 +306,7 @@ static void FileDisableAndClean(struct Mount *mnt)
{
struct filelist *flist = &tg_filelist;
struct file *filep = NULL;
const struct file_operations_vfs *originOps;
const struct file_operations_vfs *originOps = NULL;
for (int i = 3; i < CONFIG_NFILE_DESCRIPTORS; i++) {
if (!get_bit(i)) {
@ -355,7 +359,7 @@ static void VnodeTryFreeAll(struct Mount *mount)
int ForceUmountDev(struct Vnode *dev)
{
int ret;
struct Vnode *origin;
struct Vnode *origin = NULL;
struct filelist *flist = &tg_filelist;
if (dev == NULL) {
return -EINVAL;