ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme/opal: remove spdk_opal_new_pw_session

Browse Source 
We can use unpacked user and key parameters instead of packed
structure as the input parameter.

Change-Id: I1e7db5c9dd3f4055165d790105ec5d05961f8f92
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1575
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Changpeng Liu 2020-03-30 23:23:55 +08:00
parent 82e2f28df4
commit 79d17d4c37
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/nvme/nvme_opal.c
View File

@ -1585,19 +1585,20 @@ opal_add_user_to_locking_range(struct spdk_opal_dev *dev,
static int static int
opal_new_user_passwd(struct spdk_opal_dev *dev, struct opal_session *sess, opal_new_user_passwd(struct spdk_opal_dev *dev, struct opal_session *sess,
struct opal_common_session *session) enum spdk_opal_user user,
struct spdk_opal_key *opal_key)
{ {
uint8_t uid_cpin[OPAL_UID_LENGTH]; uint8_t uid_cpin[OPAL_UID_LENGTH];
int ret; int ret;
if (session->who == OPAL_ADMIN1) { if (user == OPAL_ADMIN1) {
memcpy(uid_cpin, spdk_opal_uid[UID_C_PIN_ADMIN1], OPAL_UID_LENGTH); memcpy(uid_cpin, spdk_opal_uid[UID_C_PIN_ADMIN1], OPAL_UID_LENGTH);
} else { } else {
memcpy(uid_cpin, spdk_opal_uid[UID_C_PIN_USER1], OPAL_UID_LENGTH); memcpy(uid_cpin, spdk_opal_uid[UID_C_PIN_USER1], OPAL_UID_LENGTH);
uid_cpin[7] = session->who; uid_cpin[7] = user;
} }
ret = opal_generic_pw_cmd(sess, session->opal_key.key, session->opal_key.key_len, uid_cpin, dev); ret = opal_generic_pw_cmd(sess, opal_key->key, opal_key->key_len, uid_cpin, dev);
if (ret != 0) { if (ret != 0) {
SPDK_ERRLOG("Error building set password command\n"); SPDK_ERRLOG("Error building set password command\n");
return ret; return ret;
@ -2220,35 +2221,34 @@ int
spdk_opal_cmd_set_new_passwd(struct spdk_opal_dev *dev, enum spdk_opal_user user_id, spdk_opal_cmd_set_new_passwd(struct spdk_opal_dev *dev, enum spdk_opal_user user_id,
const char *new_passwd, const char *old_passwd, bool new_user) const char *new_passwd, const char *old_passwd, bool new_user)
{ {
struct spdk_opal_new_pw_session session; struct spdk_opal_key old_key = {};
struct spdk_opal_key new_key = {};
int ret; int ret;
if (dev->supported == false) { if (dev->supported == false) {
return -ENOTSUP; return -ENOTSUP;
} }
ret = opal_init_key(&session.old_session.opal_key, old_passwd, OPAL_LOCKING_RANGE_GLOBAL); ret = opal_init_key(&old_key, old_passwd, OPAL_LOCKING_RANGE_GLOBAL);
if (ret != 0) { if (ret != 0) {
return ret; return ret;
} }
ret = opal_init_key(&session.new_session.opal_key, new_passwd, OPAL_LOCKING_RANGE_GLOBAL); ret = opal_init_key(&new_key, new_passwd, OPAL_LOCKING_RANGE_GLOBAL);
if (ret != 0) { if (ret != 0) {
return ret; return ret;
} }
session.new_session.who = user_id;
pthread_mutex_lock(&dev->mutex_lock); pthread_mutex_lock(&dev->mutex_lock);
ret = opal_start_auth_session(dev, &dev->sess, new_user ? OPAL_ADMIN1 : user_id, ret = opal_start_auth_session(dev, &dev->sess, new_user ? OPAL_ADMIN1 : user_id,
&session.old_session.opal_key); &old_key);
if (ret) { if (ret) {
SPDK_ERRLOG("start authenticate session error %d\n", ret); SPDK_ERRLOG("start authenticate session error %d\n", ret);
pthread_mutex_unlock(&dev->mutex_lock); pthread_mutex_unlock(&dev->mutex_lock);
return ret; return ret;
} }
ret = opal_new_user_passwd(dev, &dev->sess, &session.new_session); ret = opal_new_user_passwd(dev, &dev->sess, user_id, &new_key);
if (ret) { if (ret) {
SPDK_ERRLOG("set new passwd error %d\n", ret); SPDK_ERRLOG("set new passwd error %d\n", ret);
goto end; goto end;

5
lib/nvme/nvme_opal_internal.h
View File

@ -131,11 +131,6 @@ struct opal_common_session {
struct spdk_opal_key opal_key; struct spdk_opal_key opal_key;
}; };
struct spdk_opal_new_pw_session {
struct opal_common_session old_session;
struct opal_common_session new_session;
};
const uint8_t spdk_opal_uid[][OPAL_UID_LENGTH] = { const uint8_t spdk_opal_uid[][OPAL_UID_LENGTH] = {
/* users */ /* users */
[UID_SMUID] = /* Session Manager UID */ [UID_SMUID] = /* Session Manager UID */