Skip to contentSkip to conversation

Fix writing maj:min to /sys/power/resume (fixes hiberation with systemd)

PATCH Applied Azat Khuzhin 3 participants 3 messages Jul 11, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix writing maj:min to /sys/power/resume (fixes hiberation with systemd)

resume_store() first calls lookup_bdev() and after tries to handle maj:min, but it does not reset the error before, hence if you will write maj:min you will get ENOENT:

    # echo 259:2 >| /sys/power/resume
    bash: echo: write error: No such file or directory

This also should fix hiberation via systemd, since it uses this way.

Fixes 1e8c813b083c4 ("PM: hibernate: don't use early_lookup_bdev in resume_store")
Cc Christoph Hellwig <[email protected]>
---
 kernel/power/hibernate.c | 1 +
 1 file changed, 1 insertion(+)
kernel/power/hibernate.c +1 -0
index f62e89d0d906..e1b4bfa938dd 100644
@@ -1179,6 +1179,7 @@ static ssize_t resume_store(struct kobject *kobj, struct kobj_attribute *attr,
 		unsigned maj, min, offset;
 		char *p, dummy;
 
+		error = 0;
 		if (sscanf(name, "%u:%u%c", &maj, &min, &dummy) == 2 ||
 		    sscanf(name, "%u:%u:%u:%c", &maj, &min, &offset,
 				&dummy) == 3) {
Signature · 1 line
2.41.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Azat Khuzhin

resume_store() first calls lookup_bdev() and after tries to handle maj:min, but it does not reset the error before, hence if you will write maj:min you will get ENOENT:

    # echo 259:2 >| /sys/power/resume
    bash: echo: write error: No such file or directory

This also should fix hiberation via systemd, since it uses this way.

Looks good:

maintainer Applied
#2 lore raw
Quoted 6 lines · Christoph Hellwig
Quoted 4 lines · Azat Khuzhin

resume_store() first calls lookup_bdev() and after tries to handle maj:min, but it does not reset the error before, hence if you will write maj:min you will get ENOENT:

Quoted 8 lines
Quoted 4 lines
    # echo 259:2 >| /sys/power/resume
    bash: echo: write error: No such file or directory

This also should fix hiberation via systemd, since it uses this way.

Looks good:

Applied as 6.5-rc material, thanks!