From 2ea03be47c41fc83d47eeecb53deaf2e66ef772c Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 12 Jan 2023 14:38:36 +0100 Subject: jffs2: Fix return code of rtime compress The RTEMS and Linux JFFS2 compression support have a slightly different interface. This fixes a bug introduced by: commit 17c3d536ca8ee17d36ea251eade884e07ff1ee75 Author: Yang Yang Date: Thu Jan 28 02:55:35 2021 -0800 jffs2: check the validity of dstlen in jffs2_zlib_compress() KASAN reports a BUG when download file in jffs2 filesystem.It is because when dstlen == 1, cpage_out will write array out of bounds. Actually, data will not be compressed in jffs2_zlib_compress() if data's length less than 4. --- cpukit/libfs/src/jffs2/src/compr_rtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpukit/libfs/src') diff --git a/cpukit/libfs/src/jffs2/src/compr_rtime.c b/cpukit/libfs/src/jffs2/src/compr_rtime.c index 35fe2cd2a5..e3c761dcfe 100644 --- a/cpukit/libfs/src/jffs2/src/compr_rtime.c +++ b/cpukit/libfs/src/jffs2/src/compr_rtime.c @@ -45,7 +45,7 @@ uint16_t rtems_jffs2_compressor_rtime_compress( (void) self; if (*dstlen <= 3) - return -1; + return JFFS2_COMPR_NONE; memset(positions,0,sizeof(positions)); -- cgit v1.2.3