June 2020 - Linux-stable-mirror

Re: Patch "crypto: talitos - fix ECB and CBC algs ivsize" has been added to the 4.9-stable tree

by Christophe Leroy

Le 11/06/2020 à 13:21, gregkh(a)linuxfoundation.org a écrit : > > This is a note to let you know that I've just added the patch titled > > crypto: talitos - fix ECB and CBC algs ivsize > > to the 4.9-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=sum… > > The filename of the patch is: > crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch > and it can be found in the queue-4.9 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable(a)vger.kernel.org> know about it. As far as I can see, the faulty commit e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize") only removed .ivsize = AES_BLOCK_SIZE at a wrong place. The other changes (removal of .ivsize = DES_BLOCK_SIZE and .ivsize = DES3_EDE_BLOCK_SIZE) are not from the faulty patch. Christophe > > > From cantona(a)cantona.net Thu Jun 11 12:53:25 2020 > From: Su Kang Yin <cantona(a)cantona.net> > Date: Thu, 11 Jun 2020 18:07:45 +0800 > Subject: crypto: talitos - fix ECB and CBC algs ivsize > To: gregkh(a)linuxfoundation.org, linux-crypto(a)vger.kernel.org, christophe.leroy(a)c-s.fr > Cc: Su Kang Yin <cantona(a)cantona.net>, Herbert Xu <herbert(a)gondor.apana.org.au>, "David S. Miller" <davem(a)davemloft.net>, linux-kernel(a)vger.kernel.org > Message-ID: <20200611100745.6513-1-cantona(a)cantona.net> > > From: Su Kang Yin <cantona(a)cantona.net> > > Patch for 4.9 upstream: > > commit e1de42fdfc6a ("crypto: talitos - fix ECB algs ivsize") > wrongly modified CBC algs ivsize instead of ECB aggs ivsize. > > This restore the CBC algs original ivsize of removes ECB's ones. > > Signed-off-by: Su Kang Yin <cantona(a)cantona.net> > Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> > --- > drivers/crypto/talitos.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > --- a/drivers/crypto/talitos.c > +++ b/drivers/crypto/talitos.c > @@ -2636,7 +2636,6 @@ static struct talitos_alg_template drive > .cra_ablkcipher = { > .min_keysize = AES_MIN_KEY_SIZE, > .max_keysize = AES_MAX_KEY_SIZE, > - .ivsize = AES_BLOCK_SIZE, > } > }, > .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | > @@ -2670,6 +2669,7 @@ static struct talitos_alg_template drive > .cra_ablkcipher = { > .min_keysize = AES_MIN_KEY_SIZE, > .max_keysize = AES_MAX_KEY_SIZE, > + .ivsize = AES_BLOCK_SIZE, > .setkey = ablkcipher_aes_setkey, > } > }, > @@ -2687,7 +2687,6 @@ static struct talitos_alg_template drive > .cra_ablkcipher = { > .min_keysize = DES_KEY_SIZE, > .max_keysize = DES_KEY_SIZE, > - .ivsize = DES_BLOCK_SIZE, > } > }, > .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | > @@ -2720,7 +2719,6 @@ static struct talitos_alg_template drive > .cra_ablkcipher = { > .min_keysize = DES3_EDE_KEY_SIZE, > .max_keysize = DES3_EDE_KEY_SIZE, > - .ivsize = DES3_EDE_BLOCK_SIZE, > } > }, > .desc_hdr_template = DESC_HDR_TYPE_COMMON_NONSNOOP_NO_AFEU | > > > Patches currently in stable-queue which might be from cantona(a)cantona.net are > > queue-4.9/crypto-talitos-fix-ecb-and-cbc-algs-ivsize.patch >

4 years, 7 months

2
1
0 0

Re: [linux-stable-rc:linux-5.4.y 2150/5369] drivers/gpu/drm/panfrost/panfrost_job.c:279:31: warning: variable 'bo' set but not used

by Steven Price

On 28/05/2020 08:17, kbuild test robot wrote: > tree: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.y > head: e0d81ce760044efd3f26004aa32821c34968512a > commit: 3e041c27b9909704a54bc673f9110391e740f583 [2150/5369] drm/panfrost: Add the panfrost_gem_mapping concept > config: sparc-allyesconfig (attached as .config) > compiler: sparc64-linux-gcc (GCC) 9.3.0 > reproduce (this is a W=1 build): > wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross > chmod +x ~/bin/make.cross > git checkout 3e041c27b9909704a54bc673f9110391e740f583 > # save the attached .config to linux build tree > COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=sparc > > If you fix the issue, kindly add following tag as appropriate > Reported-by: kbuild test robot <lkp(a)intel.com> > > All warnings (new ones prefixed by >>, old ones prefixed by <<): > > drivers/gpu/drm/panfrost/panfrost_job.c: In function 'panfrost_job_cleanup': >>> drivers/gpu/drm/panfrost/panfrost_job.c:279:31: warning: variable 'bo' set but not used [-Wunused-but-set-variable] > 279 | struct panfrost_gem_object *bo; > | ^~ FYI: This was fixed upstream in fe154a242233 ("drm/panfrost: Remove set but not used variable 'bo'") Steve > vim +/bo +279 drivers/gpu/drm/panfrost/panfrost_job.c > > 252 > 253 static void panfrost_job_cleanup(struct kref *ref) > 254 { > 255 struct panfrost_job *job = container_of(ref, struct panfrost_job, > 256 refcount); > 257 unsigned int i; > 258 > 259 if (job->in_fences) { > 260 for (i = 0; i < job->in_fence_count; i++) > 261 dma_fence_put(job->in_fences[i]); > 262 kvfree(job->in_fences); > 263 } > 264 if (job->implicit_fences) { > 265 for (i = 0; i < job->bo_count; i++) > 266 dma_fence_put(job->implicit_fences[i]); > 267 kvfree(job->implicit_fences); > 268 } > 269 dma_fence_put(job->done_fence); > 270 dma_fence_put(job->render_done_fence); > 271 > 272 if (job->mappings) { > 273 for (i = 0; i < job->bo_count; i++) > 274 panfrost_gem_mapping_put(job->mappings[i]); > 275 kvfree(job->mappings); > 276 } > 277 > 278 if (job->bos) { > > 279 struct panfrost_gem_object *bo; > 280 > 281 for (i = 0; i < job->bo_count; i++) { > 282 bo = to_panfrost_bo(job->bos[i]); > 283 drm_gem_object_put_unlocked(job->bos[i]); > 284 } > 285 > 286 kvfree(job->bos); > 287 } > 288 > 289 kfree(job); > 290 } > 291 > > --- > 0-DAY CI Kernel Test Service, Intel Corporation > https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org >

4 years, 7 months

2
1
0 0

[PATCH v4.19.y 0/2] btrfs: Fix for CVE-2019-18885

by Vikash Bansal

CVE Description: NVD Site Link: https://nvd.nist.gov/vuln/detail?vulnId=CVE-2019-18885 It was discovered that the btrfs file system in the Linux kernel did not properly validate metadata, leading to a NULL pointer dereference. An attacker could use this to specially craft a file system image that, when mounted, could cause a denial of service (system crash). [PATCH v4.19.y 1/2]: Backporting of upsream commit 09ba3bc9dd15: btrfs: merge btrfs_find_device and find_device [PATCH v4.19.y 2/2]: Backporting of upstream commit 62fdaa52a3d0: btrfs: Detect unbalanced tree with empty leaf before crashing On NVD site link of "commit 09ba3bc9dd150457c506e4661380a6183af651c1" was given as the fix for this CVE. But the issue was still reproducible. So had to apply patch "Commit 62fdaa52a3d00a875da771719b6dc537ca79fce1" to fix the issue.

4 years, 7 months

2
3
0 0

[PATCH v2] serial: imx: Fix handling of TC irq in combination with DMA

by Schrempf Frieder

From: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> commit 1866541492641c02874bf51f9d8712b5510f2c64 upstream When using RS485 half duplex the Transmitter Complete irq is needed to determine the moment when the transmitter can be disabled. When using DMA this irq must only be enabled when DMA has completed to transfer all data. Otherwise the CPU might busily trigger this irq which is not properly handled and so the also pending irq for the DMA transfer cannot trigger. Cc: <stable(a)vger.kernel.org> # v4.14.x Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> [Backport to v4.14] Signed-off-by: Frieder Schrempf <frieder.schrempf(a)kontron.de> --- When using RS485 with DMA enabled simply transmitting some data on our i.MX6ULL based boards often freezes the system completely. The higher the baudrate, the easier it is to reproduce the issue. To test this I simply used: stty -F /dev/ttymxc1 speed 115200 while true; do echo TEST > /dev/ttymxc1; done Without the patch this leads to an almost immediate system freeze, with the patch applied, everything keeps working as expected. --- drivers/tty/serial/imx.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 3f2605edd855..70c737236870 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -538,6 +538,11 @@ static void dma_tx_callback(void *data) if (!uart_circ_empty(xmit) && !uart_tx_stopped(&sport->port)) imx_dma_tx(sport); + else if (sport->port.rs485.flags & SER_RS485_ENABLED) { + temp = readl(sport->port.membase + UCR4); + temp |= UCR4_TCEN; + writel(temp, sport->port.membase + UCR4); + } spin_unlock_irqrestore(&sport->port.lock, flags); } @@ -555,6 +560,10 @@ static void imx_dma_tx(struct imx_port *sport) if (sport->dma_is_txing) return; + temp = readl(sport->port.membase + UCR4); + temp &= ~UCR4_TCEN; + writel(temp, sport->port.membase + UCR4); + sport->tx_bytes = uart_circ_chars_pending(xmit); if (xmit->tail < xmit->head || xmit->head == 0) { @@ -617,10 +626,15 @@ static void imx_start_tx(struct uart_port *port) if (!(port->rs485.flags & SER_RS485_RX_DURING_TX)) imx_stop_rx(port); - /* enable transmitter and shifter empty irq */ - temp = readl(port->membase + UCR4); - temp |= UCR4_TCEN; - writel(temp, port->membase + UCR4); + /* + * Enable transmitter and shifter empty irq only if DMA is off. + * In the DMA case this is done in the tx-callback. + */ + if (!sport->dma_is_enabled) { + temp = readl(port->membase + UCR4); + temp |= UCR4_TCEN; + writel(temp, port->membase + UCR4); + } } if (!sport->dma_is_enabled) { -- 2.17.1

4 years, 7 months

2
2
0 0

Please apply commit 7b06a6909555 ("igb: improve handling of disconnected adapters") to v4.4.y/v4.9.y

by Jeff Chase

Hi, Please apply upstream commit 7b06a6909555 ("igb: improve handling of disconnected adapters") to v4.4.y and to v4.9.y. It fixes a kernel panic observed in chromeos-4.4. Thanks, Jeff

4 years, 7 months

2
1
0 0

[PATCH STABLE v4.4+] pwm: fsl-ftm: Use flat regmap cache

by Krzysztof Kozlowski

From: Stefan Agner <stefan(a)agner.ch> commit ad06fdeeef1cbadf86ebbe510e8079abada8b44e upstream. Use flat regmap cache to avoid lockdep warning at probe: [ 0.697285] WARNING: CPU: 0 PID: 1 at kernel/locking/lockdep.c:2755 lockdep_trace_alloc+0x15c/0x160() [ 0.697449] DEBUG_LOCKS_WARN_ON(irqs_disabled_flags(flags)) The RB-tree regmap cache needs to allocate new space on first writes. However, allocations in an atomic context (e.g. when a spinlock is held) are not allowed. The function regmap_write calls map->lock, which acquires a spinlock in the fast_io case. Since the pwm-fsl-ftm driver uses MMIO, the regmap bus of type regmap_mmio is being used which has fast_io set to true. The MMIO space of the pwm-fsl-ftm driver is reasonable condense, hence using the much faster flat regmap cache is anyway the better choice. Signed-off-by: Stefan Agner <stefan(a)agner.ch> Cc: Mark Brown <broonie(a)kernel.org> Signed-off-by: Thierry Reding <thierry.reding(a)gmail.com> Signed-off-by: Krzysztof Kozlowski <krzk(a)kernel.org> --- Fixes lockdep warning. Apply to v4.4 and newer. --- drivers/pwm/pwm-fsl-ftm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pwm/pwm-fsl-ftm.c b/drivers/pwm/pwm-fsl-ftm.c index 7225ac6b3df5..fad968eb75f6 100644 --- a/drivers/pwm/pwm-fsl-ftm.c +++ b/drivers/pwm/pwm-fsl-ftm.c @@ -392,7 +392,7 @@ static const struct regmap_config fsl_pwm_regmap_config = { .max_register = FTM_PWMLOAD, .volatile_reg = fsl_pwm_volatile_reg, - .cache_type = REGCACHE_RBTREE, + .cache_type = REGCACHE_FLAT, }; static int fsl_pwm_probe(struct platform_device *pdev) -- 2.17.1

4 years, 7 months

2
1
0 0

Re: Cherry pick 51da9dfb7f20911ae4e79e9b412a9c2d4c373d4b

by Greg KH

On Wed, Jun 10, 2020 at 01:41:59PM -0700, Jian Cai wrote: > Hello, > > @Nick Desaulniers <ndesaulniers(a)google.com> made a patch > (51da9dfb7f20911ae4e79e9b412a9c2d4c373d4b) and it was accepted to mainline > as part of ClangBuiltLinux project to make the kernel compatible with > Clang's integrated assembler. Please consider cherry picking it back to 5.4 > so that we can use Clang's integrated assembler to assemble ChromeOS' Linux > kernels. > > > commit 51da9dfb7f20911ae4e79e9b412a9c2d4c373d4b > Author: Nick Desaulniers <ndesaulniers(a)google.com> > Date: Thu Jun 4 16:50:49 2020 -0700 > > elfnote: mark all .note sections SHF_ALLOC > Now queued up,t hanks. greg k-h

4 years, 7 months

1
0
0 0

[PATCH] bpf: Support llvm-objcopy for vmlinux BTF

by Maria Teguiani

From: Fangrui Song <maskray(a)google.com> Simplify gen_btf logic to make it work with llvm-objcopy. The existing 'file format' and 'architecture' parsing logic is brittle and does not work with llvm-objcopy/llvm-objdump. 'file format' output of llvm-objdump>=11 will match GNU objdump, but 'architecture' (bfdarch) may not. .BTF in .tmp_vmlinux.btf is non-SHF_ALLOC. Add the SHF_ALLOC flag because it is part of vmlinux image used for introspection. C code can reference the section via linker script defined __start_BTF and __stop_BTF. This fixes a small problem that previous .BTF had the SHF_WRITE flag (objcopy -I binary -O elf* synthesized .data). Additionally, `objcopy -I binary` synthesized symbols _binary__btf_vmlinux_bin_start and _binary__btf_vmlinux_bin_stop (not used elsewhere) are replaced with more commonplace __start_BTF and __stop_BTF. Add 2>/dev/null because GNU objcopy (but not llvm-objcopy) warns "empty loadable segment detected at vaddr=0xffffffff81000000, is this intentional?" We use a dd command to change the e_type field in the ELF header from ET_EXEC to ET_REL so that lld will accept .btf.vmlinux.bin.o. Accepting ET_EXEC as an input file is an extremely rare GNU ld feature that lld does not intend to support, because this is error-prone. The output section description .BTF in include/asm-generic/vmlinux.lds.h avoids potential subtle orphan section placement issues and suppresses --orphan-handling=warn warnings. Fixes: df786c9b9476 ("bpf: Force .BTF section start to zero when dumping from vmlinux") Fixes: cb0cc635c7a9 ("powerpc: Include .BTF section") Reported-by: Nathan Chancellor <natechancellor(a)gmail.com> Signed-off-by: Fangrui Song <maskray(a)google.com> Signed-off-by: Daniel Borkmann <daniel(a)iogearbox.net> Tested-by: Stanislav Fomichev <sdf(a)google.com> Tested-by: Andrii Nakryiko <andriin(a)fb.com> Reviewed-by: Stanislav Fomichev <sdf(a)google.com> Reviewed-by: Kees Cook <keescook(a)chromium.org> Acked-by: Andrii Nakryiko <andriin(a)fb.com> Acked-by: Michael Ellerman <mpe(a)ellerman.id.au> (powerpc) Link: https://github.com/ClangBuiltLinux/linux/issues/871 Link: https://lore.kernel.org/bpf/20200318222746.173648-1-maskray@google.com (cherry picked from commit 90ceddcb495008ac8ba7a3dce297841efcd7d584) Cc: <stable(a)vger.kernel.org> # 5.4.x Signed-off-by: Maria Teguiani <teguiani(a)google.com> --- arch/powerpc/kernel/vmlinux.lds.S | 6 ------ include/asm-generic/vmlinux.lds.h | 22 +++++++++++++++++++--- kernel/bpf/sysfs_btf.c | 11 +++++------ scripts/link-vmlinux.sh | 24 ++++++++++-------------- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 4638d2863388..060a1acd7c6d 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -326,12 +326,6 @@ SECTIONS *(.branch_lt) } -#ifdef CONFIG_DEBUG_INFO_BTF - .BTF : AT(ADDR(.BTF) - LOAD_OFFSET) { - *(.BTF) - } -#endif - .opd : AT(ADDR(.opd) - LOAD_OFFSET) { __start_opd = .; KEEP(*(.opd)) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index dae64600ccbf..b6d7347ccda7 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -496,10 +496,12 @@ __start___modver = .; \ KEEP(*(__modver)) \ __stop___modver = .; \ - . = ALIGN((align)); \ - __end_rodata = .; \ } \ - . = ALIGN((align)); + \ + BTF \ + \ + . = ALIGN((align)); \ + __end_rodata = .; /* RODATA & RO_DATA provided for backward compatibility. * All archs are supposed to use RO_DATA() */ @@ -588,6 +590,20 @@ __stop___ex_table = .; \ } +/* + * .BTF + */ +#ifdef CONFIG_DEBUG_INFO_BTF +#define BTF \ + .BTF : AT(ADDR(.BTF) - LOAD_OFFSET) { \ + __start_BTF = .; \ + *(.BTF) \ + __stop_BTF = .; \ + } +#else +#define BTF +#endif + /* * Init task */ diff --git a/kernel/bpf/sysfs_btf.c b/kernel/bpf/sysfs_btf.c index 7ae5dddd1fe6..3b495773de5a 100644 --- a/kernel/bpf/sysfs_btf.c +++ b/kernel/bpf/sysfs_btf.c @@ -9,15 +9,15 @@ #include <linux/sysfs.h> /* See scripts/link-vmlinux.sh, gen_btf() func for details */ -extern char __weak _binary__btf_vmlinux_bin_start[]; -extern char __weak _binary__btf_vmlinux_bin_end[]; +extern char __weak __start_BTF[]; +extern char __weak __stop_BTF[]; static ssize_t btf_vmlinux_read(struct file *file, struct kobject *kobj, struct bin_attribute *bin_attr, char *buf, loff_t off, size_t len) { - memcpy(buf, _binary__btf_vmlinux_bin_start + off, len); + memcpy(buf, __start_BTF + off, len); return len; } @@ -30,15 +30,14 @@ static struct kobject *btf_kobj; static int __init btf_vmlinux_init(void) { - if (!_binary__btf_vmlinux_bin_start) + if (!__start_BTF) return 0; btf_kobj = kobject_create_and_add("btf", kernel_kobj); if (!btf_kobj) return -ENOMEM; - bin_attr_btf_vmlinux.size = _binary__btf_vmlinux_bin_end - - _binary__btf_vmlinux_bin_start; + bin_attr_btf_vmlinux.size = __stop_BTF - __start_BTF; return sysfs_create_bin_file(btf_kobj, &bin_attr_btf_vmlinux); } diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index aa1386079f0c..8b6325c2dfc5 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -113,9 +113,6 @@ vmlinux_link() gen_btf() { local pahole_ver - local bin_arch - local bin_format - local bin_file if ! [ -x "$(command -v ${PAHOLE})" ]; then echo >&2 "BTF: ${1}: pahole (${PAHOLE}) is not available" @@ -133,17 +130,16 @@ gen_btf() info "BTF" ${2} LLVM_OBJCOPY=${OBJCOPY} ${PAHOLE} -J ${1} - # dump .BTF section into raw binary file to link with final vmlinux - bin_arch=$(LANG=C ${OBJDUMP} -f ${1} | grep architecture | \ - cut -d, -f1 | cut -d' ' -f2) - bin_format=$(LANG=C ${OBJDUMP} -f ${1} | grep 'file format' | \ - awk '{print $4}') - bin_file=.btf.vmlinux.bin - ${OBJCOPY} --change-section-address .BTF=0 \ - --set-section-flags .BTF=alloc -O binary \ - --only-section=.BTF ${1} $bin_file - ${OBJCOPY} -I binary -O ${bin_format} -B ${bin_arch} \ - --rename-section .data=.BTF $bin_file ${2} + # Create ${2} which contains just .BTF section but no symbols. Add + # SHF_ALLOC because .BTF will be part of the vmlinux image. --strip-all + # deletes all symbols including __start_BTF and __stop_BTF, which will + # be redefined in the linker script. Add 2>/dev/null to suppress GNU + # objcopy warnings: "empty loadable segment detected at ..." + ${OBJCOPY} --only-section=.BTF --set-section-flags .BTF=alloc,readonly \ + --strip-all ${1} ${2} 2>/dev/null + # Change e_type to ET_REL so that it can be used to link final vmlinux. + # Unlike GNU ld, lld does not allow an ET_EXEC input. + printf '\1' | dd of=${2} conv=notrunc bs=1 seek=16 status=none } # Create ${2} .o file with all symbols from the ${1} object file -- 2.27.0.278.ge193c7cf3a9-goog

4 years, 7 months

3
2
0 0

[PATCHES] Networking

by David Miller

Please queue up the following networking bug fixes for v5.6 and v5.7 -stable, respectively. Thank you!

4 years, 7 months

2
1
0 0

[PATCH] drm/panfrost: Use kvfree() to free bo->sgts in panfrost_mmu_map_fault_addr()

by Denis Efremov

Use kvfree() to free bo->sgts, because the memory is allocated with kvmalloc_array(). Fixes: 187d2929206e ("drm/panfrost: Add support for GPU heap allocations") Cc: stable(a)vger.kernel.org Signed-off-by: Denis Efremov <efremov(a)linux.com> --- drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c index ed28aeba6d59..3c8ae7411c80 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c @@ -486,7 +486,7 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, pages = kvmalloc_array(bo->base.base.size >> PAGE_SHIFT, sizeof(struct page *), GFP_KERNEL | __GFP_ZERO); if (!pages) { - kfree(bo->sgts); + kvfree(bo->sgts); bo->sgts = NULL; mutex_unlock(&bo->base.pages_lock); ret = -ENOMEM; -- 2.26.2

4 years, 7 months

2
3
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2020