Fix if condition for nice value check

Signed-off-by: Yashodhan Joshi <yjdoc2@gmail.com>
youki-dev · Jan 21, 2024 · ee4a32e · ee4a32e
1 parent 8a0224c
commit ee4a32e
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/crates/libcontainer/src/container/tenant_builder.rs b/crates/libcontainer/src/container/tenant_builder.rs
@@ -227,13 +227,17 @@ impl TenantContainerBuilder {
                 let policy = sc.policy();
                 if let Some(nice) = sc.nice() {
                     // https://man7.org/linux/man-pages/man2/sched_setattr.2.html#top_of_page
-                    if (*policy != LinuxSchedulerPolicy::SchedBatch
-                        || *policy != LinuxSchedulerPolicy::SchedOther)
-                        && *nice < -20
-                        && *nice > 19
+                    if *policy == LinuxSchedulerPolicy::SchedBatch
+                        || *policy == LinuxSchedulerPolicy::SchedOther
                     {
-                        tracing::error!(?nice, "invalid scheduler.nice: '{}'", nice);
-                        Err(ErrInvalidSpec::Scheduler)?;
+                        if *nice < -20 || *nice > 19 {
+                            tracing::error!(
+                                ?nice,
+                                "invalid scheduler.nice: '{}', must be within -20 to 19",
+                                nice
+                            );
+                            Err(ErrInvalidSpec::Scheduler)?;
+                        }
                     }
                 }
                 if let Some(priority) = sc.priority() {