Skip to content

sed: better error messages for revert and password #2774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2025
Merged

sed: better error messages for revert and password #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/sed/sed.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ static int sed_opal_revert(int argc, char **argv, struct command *cmd,
return err;

err = sedopal_cmd_revert(dev->direct.fd);
if ((err != 0) && (err != -EOPNOTSUPP))
if ((err != 0) && (err != -EOPNOTSUPP) && (err != EPERM))
fprintf(stderr, "revert: SED error - %s\n",
sedopal_error_to_text(err));

Expand Down Expand Up @@ -190,7 +190,7 @@ static int sed_opal_password(int argc, char **argv, struct command *cmd,
return err;

err = sedopal_cmd_password(dev->direct.fd);
if (err != 0)
if ((err != 0) && (err != EPERM))
fprintf(stderr, "password: SED error - %s\n",
sedopal_error_to_text(err));

Expand Down
41 changes: 33 additions & 8 deletions plugins/sed/sedopal_cmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,15 @@ char *sedopal_get_password(char *prompt)
return NULL;

len = strlen(pass);
if (len < SEDOPAL_MIN_PASSWORD_LEN)
if (len < SEDOPAL_MIN_PASSWORD_LEN) {
fprintf(stderr, "Error: password is not long enough\n");
return NULL;
}

if (len > SEDOPAL_MAX_PASSWORD_LEN)
if (len > SEDOPAL_MAX_PASSWORD_LEN) {
fprintf(stderr, "Error: password is too long\n");
return NULL;
}

return pass;
}
Expand Down Expand Up @@ -425,8 +429,12 @@ static int sedopal_revert_psid(int fd)
rc = sedopal_set_key(&key);
if (rc == 0) {
rc = ioctl(fd, IOC_OPAL_PSID_REVERT_TPR, &key);
if (rc != 0)
fprintf(stderr, "PSID_REVERT_TPR rc %d\n", rc);
if (rc != 0) {
if (rc == EPERM)
fprintf(stderr, "Error: incorrect password\n");
else
fprintf(stderr, "PSID_REVERT_TPR rc %d\n", rc);
}
}

return rc;
Expand Down Expand Up @@ -457,6 +465,7 @@ int sedopal_cmd_revert(int fd)
#ifdef IOC_OPAL_REVERT_LSP
struct opal_revert_lsp revert_lsp;
uint8_t locking_state;
char *revert = "LSP";

locking_state = sedopal_locking_state(fd);

Expand All @@ -481,19 +490,28 @@ int sedopal_cmd_revert(int fd)

rc = ioctl(fd, IOC_OPAL_REVERT_LSP, &revert_lsp);
if (rc == 0) {
revert = "TPER";
/*
* TPER must also be reverted.
*/
rc = ioctl(fd, IOC_OPAL_REVERT_TPR, &revert_lsp.key);
if (rc != 0)
fprintf(stderr, "Error: revert TPR - %d\n", rc);
}

if (rc != 0) {
if (rc == EPERM)
fprintf(stderr, "Error: incorrect password\n");
else
fprintf(stderr, "Error: revert %s - %d\n",
revert, rc);
}
#else
rc = -EOPNOTSUPP;
#endif
}

if (rc != 0)
if ((rc != 0) && (rc != EPERM))
fprintf(stderr, "Error: failed reverting drive - %d\n", rc);

return rc;
Expand Down Expand Up @@ -533,7 +551,10 @@ int sedopal_cmd_password(int fd)
*/
rc = ioctl(fd, IOC_OPAL_SET_PW, &new_pw);
if (rc != 0) {
fprintf(stderr, "Error: failed setting password - %d\n", rc);
if (rc == EPERM)
fprintf(stderr, "Error: incorrect password\n");
else
fprintf(stderr, "Error: setting password - %d\n", rc);
return rc;
}

Expand All @@ -542,8 +563,12 @@ int sedopal_cmd_password(int fd)
* 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);
if (rc != 0) {
if (rc == EPERM)
fprintf(stderr, "Error: incorrect password\n");
else
fprintf(stderr, "Error: setting SID pw - %d\n", rc);
}
#endif

return rc;
Expand Down