diff options
author | Olivier Deprez <olivier.deprez@arm.com> | 2021-01-22 17:34:56 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-01-22 17:34:56 +0000 |
commit | 0ac8591df99cb72e609efea471ba94b0a51c9fcd (patch) | |
tree | 9a6cbe19fc7e1fdc36c15aba8da4a543119bb267 /lib | |
parent | 0b2b83ea937cd877edb13b04f32d6ed191826730 (diff) | |
parent | b226c74737090f5fca17656f43743b2c6ab766ca (diff) | |
download | trusted-firmware-a-0ac8591df99cb72e609efea471ba94b0a51c9fcd.tar.gz |
Merge "DebugFS: Check channel index before calling clone function" into integration
Diffstat (limited to 'lib')
-rw-r--r-- | lib/debugfs/dev.c | 6 | ||||
-rw-r--r-- | lib/debugfs/devfip.c | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lib/debugfs/dev.c b/lib/debugfs/dev.c index 0361437b85..2fc1d40623 100644 --- a/lib/debugfs/dev.c +++ b/lib/debugfs/dev.c @@ -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); } diff --git a/lib/debugfs/devfip.c b/lib/debugfs/devfip.c index d8b83b7a46..85e6403c70 100644 --- a/lib/debugfs/devfip.c +++ b/lib/debugfs/devfip.c @@ -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) { |