plugins/sed: add sid password change

The existing ioctl to change password only updated the admin1 password.
Add using a new ioctl IOC_OPAL_SET_SID_PW to also update the sid password
so that sid and admin1 passwords are kept in sync.

Signed-off-by: Greg Joyce <gjoyce@linux.ibm.com>

diff --git a/plugins/sed/sedopal_cmd.c b/plugins/sed/sedopal_cmd.c
index d9a789c01719b42e482cc638698f05ade103f507..017649d65966265c9d33fd9726aa688a41d7b79d 100644 (file)
--- a/plugins/sed/sedopal_cmd.c
+++ b/plugins/sed/sedopal_cmd.c
@@ -134,7 +134,7 @@ int sedopal_set_key(struct opal_key *key)
                key->key_type = OPAL_INCLUDED;
 #endif
                key->key_len = strlen(pass);
-               memcpy(key->key, pass, key->key_len);
+               memcpy(key->key, pass, key->key_len + 1);
 
                /*
                 * If getting a new key, ask for it to be re-entered
@@ -446,9 +446,23 @@ int sedopal_cmd_password(int fd)
        if (sedopal_set_key(&new_pw.new_user_pw.opal_key) != 0)
                return -EINVAL;
 
+       /*
+        * set admin1 password
+        */
        rc = ioctl(fd, IOC_OPAL_SET_PW, &new_pw);
-       if (rc != 0)
+       if (rc != 0) {
                fprintf(stderr, "Error: failed setting password - %d\n", rc);
+               return rc;
+       }
+
+#ifdef IOC_OPAL_SET_SID_PW
+       /*
+        * set sid password
+        */
+       rc = ioctl(fd, IOC_OPAL_SET_SID_PW, &new_pw);
+       if (rc != 0)
+               fprintf(stderr, "Error: failed setting SID password - %d\n", rc);
+#endif
 
        return rc;
 }