From e6eac7c4d7a20b640196b6bf62d7a6511dffdbee Mon Sep 17 00:00:00 2001 From: volcanodragon Date: Sat, 22 Jan 2022 15:20:50 +0800 Subject: [PATCH] fix patch error (cherry picked from commit 7cd3b31c4ba87f4392cd21b413738d3f43271064) --- ...am-Remove-security_password-printing.patch | 101 +++++++++--------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/9001-hdparam-Remove-security_password-printing.patch b/9001-hdparam-Remove-security_password-printing.patch index 7b9d52d..d09b0dc 100644 --- a/9001-hdparam-Remove-security_password-printing.patch +++ b/9001-hdparam-Remove-security_password-printing.patch @@ -1,50 +1,51 @@ -From deaa52e44c5464a8360e540d7b35895bc51e5143 Mon Sep 17 00:00:00 2001 -From: Wenchao Hao -Date: Mon, 30 Nov 2020 17:29:55 +0800 -Subject: [PATCH] hdparam: Remove security_password printing - -In consideration of security, passwd should not printed -in log, so this commit remove security_password printing -in code. - -Signed-off-by: Wenchao Hao -Signed-off-by: volcanodragon ---- - hdparm.c | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) - -diff --git a/hdparm.c b/hdparm.c -index 8045c87..3282d93 100644 ---- a/hdparm.c -+++ b/hdparm.c -@@ -989,8 +989,8 @@ do_set_security (int fd) - exit(EINVAL); - } - if (!quiet) { -- printf(" Issuing %s command, password=\"%s\", user=%s", -- description, security_password, (data[0] & 1) ? "master" : "user"); -+ printf(" Issuing %s command, user=%s", -+ description, (data[0] & 1) ? "master" : "user"); - if (security_command == ATA_OP_SECURITY_SET_PASS) - printf(", mode=%s", data[1] ? "max" : "high"); - printf("\n"); -@@ -3004,17 +3004,6 @@ static void get_security_password (int handle_NULL) - } else if (!handle_NULL || strcmp(argp, "NULL")) { - strcpy(security_password, argp); - } -- printf("security_password:"); -- if (!binary_passwd) { -- printf(" \"%s\"\n", security_password); -- } else { -- unsigned int i; -- for (i = 0; i < maxlen; ++i) { -- unsigned char c = security_password[i]; -- printf(" %02x", c); -- } -- putchar('\n'); -- } - while (*argp) - ++argp; - } --- -1.8.3.1 +From deaa52e44c5464a8360e540d7b35895bc51e5143 Mon Sep 17 00:00:00 2001 +From: Wenchao Hao +Date: Mon, 30 Nov 2020 17:29:55 +0800 +Subject: [PATCH] hdparam: Remove security_password printing + +In consideration of security, passwd should not printed +in log, so this commit remove security_password printing +in code. + +Signed-off-by: Wenchao Hao +Signed-off-by: volcanodragon +--- + hdparm.c | 15 ++------------- + 1 file changed, 2 insertions(+), 13 deletions(-) + +diff --git a/hdparm.c b/hdparm.c +index 8045c87..3282d93 100644 +--- a/hdparm.c ++++ b/hdparm.c +@@ -989,8 +989,8 @@ do_set_security (int fd) + exit(EINVAL); + } + if (!quiet) { +- printf(" Issuing %s command, password=\"%s\", user=%s", +- description, security_password, (data[0] & 1) ? "master" : "user"); ++ printf(" Issuing %s command, user=%s", ++ description, (data[0] & 1) ? "master" : "user"); + if (security_command == ATA_OP_SECURITY_SET_PASS) + printf(", mode=%s", data[1] ? "max" : "high"); + printf("\n"); +@@ -3004,17 +3004,6 @@ static void get_security_password (int handle_NULL) + } else if (!handle_NULL || strcmp(argp, "NULL")) { + strcpy(security_password, argp); + } +- printf("security_password:"); +- if (!binary_passwd) { +- printf(" \"%s\"\n", security_password); +- } else { +- unsigned int i; +- for (i = 0; i < maxlen; ++i) { +- unsigned char c = security_password[i]; +- printf(" %02x", c); +- } +- putchar('\n'); +- } + while (*argp) + ++argp; + } +-- +1.8.3.1 +