Merge tag 'modules-6.4-rc5-second-pull' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux

torvalds · torvalds · commit c43a6ff9f93f · 2023-06-01T20:48:16.000-04:00
Pull modules fix from Luis Chamberlain:
 "A zstd fix by lucas as he tested zstd decompression support"

* tag 'modules-6.4-rc5-second-pull' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux:
  module/decompress: Fix error checking on zstd decompression
diff --git a/kernel/module/decompress.c b/kernel/module/decompress.c
@@ -257,7 +257,7 @@ static ssize_t module_zstd_decompress(struct load_info *info,
 	do {
 		struct page *page = module_get_next_page(info);
 
-		if (!IS_ERR(page)) {
+		if (IS_ERR(page)) {
 			retval = PTR_ERR(page);
 			goto out;
 		}

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ static ssize_t module_zstd_decompress(struct load_info *info,`
`257`	`257`	`do {`
`258`	`258`	`struct page *page = module_get_next_page(info);`
`259`	`259`
`260`		`- if (!IS_ERR(page)) {`
	`260`	`+ if (IS_ERR(page)) {`
`261`	`261`	`retval = PTR_ERR(page);`
`262`	`262`	`goto out;`
`263`	`263`	`}`