andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "DebugFS: Check channel index before calling clone function" into integration

This commit is contained in:
Olivier Deprez 2021-01-22 17:34:56 +00:00 committed by TrustedFirmware Code Review
parent 0b2b83ea93 b226c74737
commit 0ac8591df9
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/debugfs/dev.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Arm Limited. All rights reserved.
* Copyright (c) 2019-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -333,6 +333,10 @@ noent:
******************************************************************************/
chan_t *clone(chan_t *c, chan_t *nc)
{
if (c->index == NODEV) {
return NULL;
}
return devtab[c->index]->clone(c, nc);
}

11
lib/debugfs/devfip.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019-2020, Arm Limited. All rights reserved.
* Copyright (c) 2019-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -129,7 +129,10 @@ static int fipgen(chan_t *c, const dirtab_t *tab, int ntab, int n, dir_t *dir)
panic();
}
clone(archives[c->dev].c, &nc);
if (clone(archives[c->dev].c, &nc) == NULL) {
panic();
}
fip = &archives[nc.dev];
off = STOC_HEADER;
@ -202,7 +205,9 @@ static int fipread(chan_t *c, void *buf, int n)
panic();
}
clone(fip->c, &cs);
if (clone(fip->c, &cs) == NULL) {
panic();
}
size = fip->size[c->qid];
if (c->offset >= size) {