From 2f93924bb42a4ec444e329e34077bbf85ed2e54b Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 22 May 2008 16:34:50 +0000
Subject: [PATCH] Prevent invalid memory reference when using srun's
--cpu_bind=cores option (slurm-1.3.2-1.cea1.patch from Matthieu Hautreux,
CEA).
---
AUTHORS | 3 ++-
NEWS | 2 ++
doc/html/team.shtml | 3 ++-
src/srun/opt.c | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index a2abb05d169..f12487efb95 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,8 +11,9 @@ Chris Dunlap <cdunlap(at)llnl.gov>
Joey Ekstrom <ekstrom1(at)llnl.gov>
Jim Garlick <garlick(at)llnl.gov>
Mark Grondona <mgrondona(at)llnl.gov>
-Christopher Holmes <cholmes(at)hp.com>
Takao Hatazaki <takao.hatazaki(at)hp.com>
+Matthieu Hautreux <matthieu.hautreux(at)cea.fr>
+Christopher Holmes <cholmes(at)hp.com>
Nathan Huff <nhuff(at)geekshanty.com>
David Jackson <jacksond(at)clusterresources.com>
Greg Johnson <gjohnson(at)lanl.gov>
diff --git a/NEWS b/NEWS
index d07bb40d964..5ddcaff8d69 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ documents those changes that are of interest to users and admins.
* Changes in SLURM 1.3.3
========================
-- Add mpi_openmpi plugin to the main SLURM RPM.
+ -- Prevent invalid memory reference when using srun's --cpu_bind=cores option
+ (slurm-1.3.2-1.cea1.patch from Matthieu Hautreux, CEA).
* Changes in SLURM 1.3.2
========================
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index e269bbbec62..2e5ffd54700 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -31,6 +31,7 @@
<li>Jim Garlick (LLNL)</li>
<li>Mark Grondona (LLNL)</li>
<li>Takao Hatazaki (HP, Japan)</li>
+<li>Matthieu Hautreux (CEA, France)</li>
<li>Nathan Huff (North Dakota State University)</li>
<li>David Jackson (Cluster Resources)</li>
<li>Greg Johnson (LANL)</li>
@@ -59,6 +60,6 @@ Networking, Italy)</li>
<li>Anne-Marie Wunderlin (Bull)</li>
</ul>
-<p style="text-align:center;">Last modified 11 September 2007</p>
+<p style="text-align:center;">Last modified 22 May 2008</p>
<!--#include virtual="footer.txt"-->
diff --git a/src/srun/opt.c b/src/srun/opt.c
index 96bb478c73a..17d4198111b 100644
--- a/src/srun/opt.c
+++ b/src/srun/opt.c
@@ -408,7 +408,7 @@ static int _verify_cpu_bind(const char *arg, char **cpu_bind,
CPU_BIND_TO_SOCKETS);
} else if ((strcasecmp(tok, "core") == 0) ||
(strcasecmp(tok, "cores") == 0)) {
- clear_then_set((int *)bind, bind_to_bits,
+ clear_then_set((int *)flags, bind_to_bits,
CPU_BIND_TO_CORES);
} else if ((strcasecmp(tok, "thread") == 0) ||
(strcasecmp(tok, "threads") == 0)) {
--
GitLab