Unverified Commit b4cb7c96 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13004 CVE-2024-50064 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tong Tiangen <tongtiangen@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/YOMAAADC754XU24F4UPHECCWTQV3YN7J/ 
Andrey Skvortsov (1):
  zram: don't free statically defined names

Sergey Senozhatsky (1):
  zram: free secondary algorithms names


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/IAYRI0 
 
Link:https://gitee.com/openeuler/kernel/pulls/13004

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents eee89848 310c279d

drivers/block/zram/zram_drv.c

+7 −0
Original line number Diff line number Diff line
@@ -1980,6 +1980,13 @@ static void zram_destroy_comps(struct zram *zram) 
		zcomp_destroy(comp);

		zram->num_active_comps--;

	}



	for (prio = ZRAM_PRIMARY_COMP; prio < ZRAM_MAX_COMPS; prio++) {

		/* Do not free statically defined compression algorithms */

		if (zram->comp_algs[prio] != default_compressor)

			kfree(zram->comp_algs[prio]);

		zram->comp_algs[prio] = NULL;

	}

}



static void zram_reset_device(struct zram *zram)