diff for duplicates of <20180831084057.GA9346@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 220c556..9c2ba36 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,9 +66,9 @@ Should it rather be intel_mktme.c? And intel_mktme-type.h. > --- /dev/null > +++ b/Documentation/security/keys/mktme.rst > @@ -0,0 +1,69 @@ -> +===================== +> +========================================== > +Keys for Multi-Key Total Memory Encryption -> +===================== +> +========================================== > + > +Keys for Multi-Key Total Memory Encryption (MKTME) are a new key type > +added to the existing kernel key ring service. @@ -121,7 +121,7 @@ A tautology: tweak is a tweak. What is "a tweak"? > +Sample usage MK-TME Key Service API with mktme_mprotect() API:: > + > + Add a key:: -> + key = add_key(mktme, name, "userkey" tweakD", strlen(argv[3]), +> + key = add_key(mktme, name, "userkey=22 tweak=44", strlen(argv[3]), > + KEY_SPEC_USER_KEYRING); > + Map memory:: > + ptr = mmap(NULL, size, prot, MAP_ANONYMOUS, -1, 0); @@ -355,7 +355,7 @@ construction. > + int i = mktme_max_keyids; > + > + for (i = mktme_max_keyids; i > 0; i--) -> + if (mktme_map->id[i].serial = serial) +> + if (mktme_map->id[i].serial == serial) > + return i; > + return -EINVAL; > +} @@ -378,7 +378,7 @@ construction. No TODO's allowed. > + -> + if (ret = MKTME_PROG_SUCCESS) { +> + if (ret == MKTME_PROG_SUCCESS) { > + mktme_map->id[kprog->keyid].serial = 0; > + mktme_map->id[kprog->keyid].count = 0; > + mktme_mapped_keyids--; @@ -453,7 +453,7 @@ This should be in kdoc format and no newline-character in-between. > + else > + keyid = mktme_recover_key(); > + -> + if (keyid = 0) +> + if (keyid == 0) > + return -EDQUOT; > + > + kprog->keyid = keyid; @@ -461,7 +461,7 @@ This should be in kdoc format and no newline-character in-between. > + > + /* TODO ret = mktme_key_program(kprog); */ > + ret = MKTME_PROG_SUCCESS; -> + if (ret = MKTME_PROG_SUCCESS) { +> + if (ret == MKTME_PROG_SUCCESS) { > + mktme_map->id[keyid].serial = serial; > + mktme_map->id[keyid].count = 0; > + mktme_mapped_keyids++; @@ -559,7 +559,7 @@ https://www.kernel.org/doc/Documentation/kernel-doc-nano-HOWTO.txt > + char *p = datablob; > + > + while ((p = strsep(&datablob, " \t"))) { -> + if (*p = '\0' || *p = ' ' || *p = '\t') +> + if (*p == '\0' || *p == ' ' || *p == '\t') > + continue; > + token = match_token(p, mktme_tokens, args); > + if (test_and_set_bit(token, &token_mask)) @@ -711,7 +711,7 @@ https://www.kernel.org/doc/Documentation/kernel-doc-nano-HOWTO.txt > > -- > To unsubscribe from this list: send the line "unsubscribe keyrings" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Even for RFC you should aim something that could be wrong but you think diff --git a/a/content_digest b/N1/content_digest index 9a7ccaf..5998b10 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020180525233135.GA2774@alison-desk.jf.intel.com\0" - "From\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" - "Subject\0Re: [RFC] KEYS: add a new type \"mktme\" to kernel key services\0" - "Date\0Fri, 31 Aug 2018 08:40:57 +0000\0" + "From\0jarkko.sakkinen@linux.intel.com (Jarkko Sakkinen)\0" + "Subject\0[RFC] KEYS: add a new type \"mktme\" to kernel key services\0" + "Date\0Fri, 31 Aug 2018 11:40:57 +0300\0" "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" @@ -73,9 +73,9 @@ "> --- /dev/null\n" "> +++ b/Documentation/security/keys/mktme.rst\n" "> @@ -0,0 +1,69 @@\n" - "> +=====================\n" + "> +==========================================\n" "> +Keys for Multi-Key Total Memory Encryption\n" - "> +=====================\n" + "> +==========================================\n" "> +\n" "> +Keys for Multi-Key Total Memory Encryption (MKTME) are a new key type\n" "> +added to the existing kernel key ring service.\n" @@ -128,7 +128,7 @@ "> +Sample usage MK-TME Key Service API with mktme_mprotect() API::\n" "> +\n" "> + Add a key::\n" - "> + key = add_key(mktme, name, \"userkey\" tweakD\", strlen(argv[3]),\n" + "> + key = add_key(mktme, name, \"userkey=22 tweak=44\", strlen(argv[3]),\n" "> + KEY_SPEC_USER_KEYRING);\n" "> + Map memory::\n" "> + ptr = mmap(NULL, size, prot, MAP_ANONYMOUS, -1, 0);\n" @@ -362,7 +362,7 @@ "> +\tint i = mktme_max_keyids;\n" "> +\n" "> +\tfor (i = mktme_max_keyids; i > 0; i--)\n" - "> +\t\tif (mktme_map->id[i].serial = serial)\n" + "> +\t\tif (mktme_map->id[i].serial == serial)\n" "> +\t\t\treturn i;\n" "> +\treturn -EINVAL;\n" "> +}\n" @@ -385,7 +385,7 @@ "No TODO's allowed.\n" "\n" "> +\n" - "> +\tif (ret = MKTME_PROG_SUCCESS) {\n" + "> +\tif (ret == MKTME_PROG_SUCCESS) {\n" "> +\t\tmktme_map->id[kprog->keyid].serial = 0;\n" "> +\t\tmktme_map->id[kprog->keyid].count = 0;\n" "> +\t\tmktme_mapped_keyids--;\n" @@ -460,7 +460,7 @@ "> +\telse\n" "> +\t\tkeyid = mktme_recover_key();\n" "> +\n" - "> +\tif (keyid = 0)\n" + "> +\tif (keyid == 0)\n" "> +\t\treturn -EDQUOT;\n" "> +\n" "> +\tkprog->keyid = keyid;\n" @@ -468,7 +468,7 @@ "> +\n" "> +\t/* TODO ret = mktme_key_program(kprog); */\n" "> +\tret = MKTME_PROG_SUCCESS;\n" - "> +\tif (ret = MKTME_PROG_SUCCESS) {\n" + "> +\tif (ret == MKTME_PROG_SUCCESS) {\n" "> +\t\tmktme_map->id[keyid].serial = serial;\n" "> +\t\tmktme_map->id[keyid].count = 0;\n" "> +\t\tmktme_mapped_keyids++;\n" @@ -566,7 +566,7 @@ "> +\tchar *p = datablob;\n" "> +\n" "> +\twhile ((p = strsep(&datablob, \" \\t\"))) {\n" - "> +\t\tif (*p = '\\0' || *p = ' ' || *p = '\\t')\n" + "> +\t\tif (*p == '\\0' || *p == ' ' || *p == '\\t')\n" "> +\t\t\tcontinue;\n" "> +\t\ttoken = match_token(p, mktme_tokens, args);\n" "> +\t\tif (test_and_set_bit(token, &token_mask))\n" @@ -718,7 +718,7 @@ "> \n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe keyrings\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" "\n" "Even for RFC you should aim something that could be wrong but you think\n" @@ -727,4 +727,4 @@ "\n" /Jarkko -6d94bce51967aa57d053710133cbf01a04135841ee4f81860d8832441366c00b +7c7afc26127294b8391a4793a275942fd3aa1ce58c51b1d91f1395a40f8559ac
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.