All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20190211172738.4633-16-ebiggers@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index 213f5f0..b37c094 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -388,7 +388,7 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 -		goto out_wipe_secret;
 -
 -	if (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
-+	if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
++	if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
 +		/*
 +		 * Only root can add keys that are identified by an arbitrary
 +		 * descriptor rather than by a cryptographic hash --- since
@@ -427,7 +427,7 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 +	 * Only root can add and remove keys that are identified by an arbitrary
 +	 * descriptor rather than by a cryptographic hash.
 +	 */
-+	if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&
++	if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&
 +	    !capable(CAP_SYS_ADMIN))
  		return -EACCES;
  
@@ -512,7 +512,8 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 +		arg.user_count = mk->mk_users->keys.nr_leaves_on_tree;
 +		mk_user = find_master_key_user(mk);
 +		if (!IS_ERR(mk_user)) {
-+			arg.status_flags |+				FSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;
++			arg.status_flags |=
++				FSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;
 +			key_put(mk_user);
 +		} else if (mk_user != ERR_PTR(-ENOKEY)) {
 +			err = PTR_ERR(mk_user);
@@ -596,7 +597,7 @@ index a15a4bbafa3c..a783b6195618 100644
 +		up_read(&mk->mk_secret_sem);
  		key_put(master_key);
  	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
 diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h
 index 26879e669dfa..fd1c3e2b0b7c 100644
 --- a/include/uapi/linux/fscrypt.h
diff --git a/a/content_digest b/N1/content_digest
index a1f12ef..0b02e5b 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\020190211172738.4633-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
  "Subject\0[RFC PATCH v2 15/20] fscrypt: allow unprivileged users to add/remove keys for v2 policies\0"
- "Date\0Mon, 11 Feb 2019 17:27:33 +0000\0"
+ "Date\0Mon, 11 Feb 2019 09:27:33 -0800\0"
  "To\0linux-fscrypt@vger.kernel.org\0"
  "Cc\0Satya Tangirala <satyat@google.com>"
   linux-api@vger.kernel.org
@@ -404,7 +404,7 @@
  "-\t\tgoto out_wipe_secret;\n"
  "-\n"
  "-\tif (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
- "+\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
+ "+\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
  "+\t\t/*\n"
  "+\t\t * Only root can add keys that are identified by an arbitrary\n"
  "+\t\t * descriptor rather than by a cryptographic hash --- since\n"
@@ -443,7 +443,7 @@
  "+\t * Only root can add and remove keys that are identified by an arbitrary\n"
  "+\t * descriptor rather than by a cryptographic hash.\n"
  "+\t */\n"
- "+\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&\n"
+ "+\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&\n"
  "+\t    !capable(CAP_SYS_ADMIN))\n"
  " \t\treturn -EACCES;\n"
  " \n"
@@ -528,7 +528,8 @@
  "+\t\targ.user_count = mk->mk_users->keys.nr_leaves_on_tree;\n"
  "+\t\tmk_user = find_master_key_user(mk);\n"
  "+\t\tif (!IS_ERR(mk_user)) {\n"
- "+\t\t\targ.status_flags |+\t\t\t\tFSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;\n"
+ "+\t\t\targ.status_flags |=\n"
+ "+\t\t\t\tFSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;\n"
  "+\t\t\tkey_put(mk_user);\n"
  "+\t\t} else if (mk_user != ERR_PTR(-ENOKEY)) {\n"
  "+\t\t\terr = PTR_ERR(mk_user);\n"
@@ -612,7 +613,7 @@
  "+\t\tup_read(&mk->mk_secret_sem);\n"
  " \t\tkey_put(master_key);\n"
  " \t}\n"
- " \tif (res = -ENOKEY)\n"
+ " \tif (res == -ENOKEY)\n"
  "diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h\n"
  "index 26879e669dfa..fd1c3e2b0b7c 100644\n"
  "--- a/include/uapi/linux/fscrypt.h\n"
@@ -643,4 +644,4 @@
  "-- \n"
  2.20.1
 
-7c81d4807c457bd34f32d661c4d8d3701b2468049184fd45cb8b8646b69f0ee5
+8fe72d05e8c9740cf05747c8bf86f177be1f194d9eb5f5cb480f643f95907b3b

diff --git a/a/1.txt b/N2/1.txt
index 213f5f0..b37c094 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -388,7 +388,7 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 -		goto out_wipe_secret;
 -
 -	if (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
-+	if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
++	if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
 +		/*
 +		 * Only root can add keys that are identified by an arbitrary
 +		 * descriptor rather than by a cryptographic hash --- since
@@ -427,7 +427,7 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 +	 * Only root can add and remove keys that are identified by an arbitrary
 +	 * descriptor rather than by a cryptographic hash.
 +	 */
-+	if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&
++	if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&
 +	    !capable(CAP_SYS_ADMIN))
  		return -EACCES;
  
@@ -512,7 +512,8 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 +		arg.user_count = mk->mk_users->keys.nr_leaves_on_tree;
 +		mk_user = find_master_key_user(mk);
 +		if (!IS_ERR(mk_user)) {
-+			arg.status_flags |+				FSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;
++			arg.status_flags |=
++				FSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;
 +			key_put(mk_user);
 +		} else if (mk_user != ERR_PTR(-ENOKEY)) {
 +			err = PTR_ERR(mk_user);
@@ -596,7 +597,7 @@ index a15a4bbafa3c..a783b6195618 100644
 +		up_read(&mk->mk_secret_sem);
  		key_put(master_key);
  	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
 diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h
 index 26879e669dfa..fd1c3e2b0b7c 100644
 --- a/include/uapi/linux/fscrypt.h
diff --git a/a/content_digest b/N2/content_digest
index a1f12ef..fcc6f30 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,16 +1,16 @@
  "ref\020190211172738.4633-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
  "Subject\0[RFC PATCH v2 15/20] fscrypt: allow unprivileged users to add/remove keys for v2 policies\0"
- "Date\0Mon, 11 Feb 2019 17:27:33 +0000\0"
+ "Date\0Mon, 11 Feb 2019 09:27:33 -0800\0"
  "To\0linux-fscrypt@vger.kernel.org\0"
- "Cc\0Satya Tangirala <satyat@google.com>"
-  linux-api@vger.kernel.org
+ "Cc\0linux-ext4@vger.kernel.org"
   linux-f2fs-devel@lists.sourceforge.net
-  keyrings@vger.kernel.org
   linux-mtd@lists.infradead.org
-  linux-crypto@vger.kernel.org
   linux-fsdevel@vger.kernel.org
-  linux-ext4@vger.kernel.org
+  linux-crypto@vger.kernel.org
+  linux-api@vger.kernel.org
+  keyrings@vger.kernel.org
+  Satya Tangirala <satyat@google.com>
  " Paul Crowley <paulcrowley@google.com>\0"
  "\00:1\0"
  "b\0"
@@ -404,7 +404,7 @@
  "-\t\tgoto out_wipe_secret;\n"
  "-\n"
  "-\tif (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
- "+\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
+ "+\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
  "+\t\t/*\n"
  "+\t\t * Only root can add keys that are identified by an arbitrary\n"
  "+\t\t * descriptor rather than by a cryptographic hash --- since\n"
@@ -443,7 +443,7 @@
  "+\t * Only root can add and remove keys that are identified by an arbitrary\n"
  "+\t * descriptor rather than by a cryptographic hash.\n"
  "+\t */\n"
- "+\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&\n"
+ "+\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&\n"
  "+\t    !capable(CAP_SYS_ADMIN))\n"
  " \t\treturn -EACCES;\n"
  " \n"
@@ -528,7 +528,8 @@
  "+\t\targ.user_count = mk->mk_users->keys.nr_leaves_on_tree;\n"
  "+\t\tmk_user = find_master_key_user(mk);\n"
  "+\t\tif (!IS_ERR(mk_user)) {\n"
- "+\t\t\targ.status_flags |+\t\t\t\tFSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;\n"
+ "+\t\t\targ.status_flags |=\n"
+ "+\t\t\t\tFSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;\n"
  "+\t\t\tkey_put(mk_user);\n"
  "+\t\t} else if (mk_user != ERR_PTR(-ENOKEY)) {\n"
  "+\t\t\terr = PTR_ERR(mk_user);\n"
@@ -612,7 +613,7 @@
  "+\t\tup_read(&mk->mk_secret_sem);\n"
  " \t\tkey_put(master_key);\n"
  " \t}\n"
- " \tif (res = -ENOKEY)\n"
+ " \tif (res == -ENOKEY)\n"
  "diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h\n"
  "index 26879e669dfa..fd1c3e2b0b7c 100644\n"
  "--- a/include/uapi/linux/fscrypt.h\n"
@@ -643,4 +644,4 @@
  "-- \n"
  2.20.1
 
-7c81d4807c457bd34f32d661c4d8d3701b2468049184fd45cb8b8646b69f0ee5
+ef57d2d8fc10857ee1b0f346d7644e3803cd5bc8ea5ea4559cf52f741bfccfa1

diff --git a/a/1.txt b/N3/1.txt
index 213f5f0..32b9cc8 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -388,7 +388,7 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 -		goto out_wipe_secret;
 -
 -	if (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
-+	if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
++	if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
 +		/*
 +		 * Only root can add keys that are identified by an arbitrary
 +		 * descriptor rather than by a cryptographic hash --- since
@@ -427,7 +427,7 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 +	 * Only root can add and remove keys that are identified by an arbitrary
 +	 * descriptor rather than by a cryptographic hash.
 +	 */
-+	if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&
++	if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&
 +	    !capable(CAP_SYS_ADMIN))
  		return -EACCES;
  
@@ -512,7 +512,8 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 +		arg.user_count = mk->mk_users->keys.nr_leaves_on_tree;
 +		mk_user = find_master_key_user(mk);
 +		if (!IS_ERR(mk_user)) {
-+			arg.status_flags |+				FSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;
++			arg.status_flags |=
++				FSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;
 +			key_put(mk_user);
 +		} else if (mk_user != ERR_PTR(-ENOKEY)) {
 +			err = PTR_ERR(mk_user);
@@ -596,7 +597,7 @@ index a15a4bbafa3c..a783b6195618 100644
 +		up_read(&mk->mk_secret_sem);
  		key_put(master_key);
  	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
 diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h
 index 26879e669dfa..fd1c3e2b0b7c 100644
 --- a/include/uapi/linux/fscrypt.h
@@ -626,3 +627,10 @@ index 26879e669dfa..fd1c3e2b0b7c 100644
  #define FS_IOC_SET_ENCRYPTION_POLICY	  _IOR('f', 19, struct fscrypt_policy)
 -- 
 2.20.1
+
+
+
+_______________________________________________
+Linux-f2fs-devel mailing list
+Linux-f2fs-devel@lists.sourceforge.net
+https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
diff --git a/a/content_digest b/N3/content_digest
index a1f12ef..b12de19 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -1,7 +1,7 @@
  "ref\020190211172738.4633-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
- "Subject\0[RFC PATCH v2 15/20] fscrypt: allow unprivileged users to add/remove keys for v2 policies\0"
- "Date\0Mon, 11 Feb 2019 17:27:33 +0000\0"
+ "Subject\0[f2fs-dev] [RFC PATCH v2 15/20] fscrypt: allow unprivileged users to add/remove keys for v2 policies\0"
+ "Date\0Mon, 11 Feb 2019 09:27:33 -0800\0"
  "To\0linux-fscrypt@vger.kernel.org\0"
  "Cc\0Satya Tangirala <satyat@google.com>"
   linux-api@vger.kernel.org
@@ -404,7 +404,7 @@
  "-\t\tgoto out_wipe_secret;\n"
  "-\n"
  "-\tif (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
- "+\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
+ "+\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
  "+\t\t/*\n"
  "+\t\t * Only root can add keys that are identified by an arbitrary\n"
  "+\t\t * descriptor rather than by a cryptographic hash --- since\n"
@@ -443,7 +443,7 @@
  "+\t * Only root can add and remove keys that are identified by an arbitrary\n"
  "+\t * descriptor rather than by a cryptographic hash.\n"
  "+\t */\n"
- "+\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&\n"
+ "+\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&\n"
  "+\t    !capable(CAP_SYS_ADMIN))\n"
  " \t\treturn -EACCES;\n"
  " \n"
@@ -528,7 +528,8 @@
  "+\t\targ.user_count = mk->mk_users->keys.nr_leaves_on_tree;\n"
  "+\t\tmk_user = find_master_key_user(mk);\n"
  "+\t\tif (!IS_ERR(mk_user)) {\n"
- "+\t\t\targ.status_flags |+\t\t\t\tFSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;\n"
+ "+\t\t\targ.status_flags |=\n"
+ "+\t\t\t\tFSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;\n"
  "+\t\t\tkey_put(mk_user);\n"
  "+\t\t} else if (mk_user != ERR_PTR(-ENOKEY)) {\n"
  "+\t\t\terr = PTR_ERR(mk_user);\n"
@@ -612,7 +613,7 @@
  "+\t\tup_read(&mk->mk_secret_sem);\n"
  " \t\tkey_put(master_key);\n"
  " \t}\n"
- " \tif (res = -ENOKEY)\n"
+ " \tif (res == -ENOKEY)\n"
  "diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h\n"
  "index 26879e669dfa..fd1c3e2b0b7c 100644\n"
  "--- a/include/uapi/linux/fscrypt.h\n"
@@ -641,6 +642,13 @@
  " \n"
  " #define FS_IOC_SET_ENCRYPTION_POLICY\t  _IOR('f', 19, struct fscrypt_policy)\n"
  "-- \n"
- 2.20.1
+ "2.20.1\n"
+ "\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "Linux-f2fs-devel mailing list\n"
+ "Linux-f2fs-devel@lists.sourceforge.net\n"
+ https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
 
-7c81d4807c457bd34f32d661c4d8d3701b2468049184fd45cb8b8646b69f0ee5
+e90896aa298c929adaf5c31e52e1f174d05ddf4f5e6577303fb51a9b4a2697d5

diff --git a/a/1.txt b/N4/1.txt
index 213f5f0..bae3025 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -388,7 +388,7 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 -		goto out_wipe_secret;
 -
 -	if (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
-+	if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
++	if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {
 +		/*
 +		 * Only root can add keys that are identified by an arbitrary
 +		 * descriptor rather than by a cryptographic hash --- since
@@ -427,7 +427,7 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 +	 * Only root can add and remove keys that are identified by an arbitrary
 +	 * descriptor rather than by a cryptographic hash.
 +	 */
-+	if (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&
++	if (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&
 +	    !capable(CAP_SYS_ADMIN))
  		return -EACCES;
  
@@ -512,7 +512,8 @@ index 6bf1e0672a09..15ca0f1d04e7 100644
 +		arg.user_count = mk->mk_users->keys.nr_leaves_on_tree;
 +		mk_user = find_master_key_user(mk);
 +		if (!IS_ERR(mk_user)) {
-+			arg.status_flags |+				FSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;
++			arg.status_flags |=
++				FSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;
 +			key_put(mk_user);
 +		} else if (mk_user != ERR_PTR(-ENOKEY)) {
 +			err = PTR_ERR(mk_user);
@@ -596,7 +597,7 @@ index a15a4bbafa3c..a783b6195618 100644
 +		up_read(&mk->mk_secret_sem);
  		key_put(master_key);
  	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
 diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h
 index 26879e669dfa..fd1c3e2b0b7c 100644
 --- a/include/uapi/linux/fscrypt.h
@@ -626,3 +627,8 @@ index 26879e669dfa..fd1c3e2b0b7c 100644
  #define FS_IOC_SET_ENCRYPTION_POLICY	  _IOR('f', 19, struct fscrypt_policy)
 -- 
 2.20.1
+
+
+______________________________________________________
+Linux MTD discussion mailing list
+http://lists.infradead.org/mailman/listinfo/linux-mtd/
diff --git a/a/content_digest b/N4/content_digest
index a1f12ef..42aa024 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -1,7 +1,7 @@
  "ref\020190211172738.4633-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
  "Subject\0[RFC PATCH v2 15/20] fscrypt: allow unprivileged users to add/remove keys for v2 policies\0"
- "Date\0Mon, 11 Feb 2019 17:27:33 +0000\0"
+ "Date\0Mon, 11 Feb 2019 09:27:33 -0800\0"
  "To\0linux-fscrypt@vger.kernel.org\0"
  "Cc\0Satya Tangirala <satyat@google.com>"
   linux-api@vger.kernel.org
@@ -404,7 +404,7 @@
  "-\t\tgoto out_wipe_secret;\n"
  "-\n"
  "-\tif (arg.key_spec.type != FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
- "+\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
+ "+\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR) {\n"
  "+\t\t/*\n"
  "+\t\t * Only root can add keys that are identified by an arbitrary\n"
  "+\t\t * descriptor rather than by a cryptographic hash --- since\n"
@@ -443,7 +443,7 @@
  "+\t * Only root can add and remove keys that are identified by an arbitrary\n"
  "+\t * descriptor rather than by a cryptographic hash.\n"
  "+\t */\n"
- "+\tif (arg.key_spec.type = FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&\n"
+ "+\tif (arg.key_spec.type == FSCRYPT_KEY_SPEC_TYPE_DESCRIPTOR &&\n"
  "+\t    !capable(CAP_SYS_ADMIN))\n"
  " \t\treturn -EACCES;\n"
  " \n"
@@ -528,7 +528,8 @@
  "+\t\targ.user_count = mk->mk_users->keys.nr_leaves_on_tree;\n"
  "+\t\tmk_user = find_master_key_user(mk);\n"
  "+\t\tif (!IS_ERR(mk_user)) {\n"
- "+\t\t\targ.status_flags |+\t\t\t\tFSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;\n"
+ "+\t\t\targ.status_flags |=\n"
+ "+\t\t\t\tFSCRYPT_KEY_STATUS_FLAG_ADDED_BY_SELF;\n"
  "+\t\t\tkey_put(mk_user);\n"
  "+\t\t} else if (mk_user != ERR_PTR(-ENOKEY)) {\n"
  "+\t\t\terr = PTR_ERR(mk_user);\n"
@@ -612,7 +613,7 @@
  "+\t\tup_read(&mk->mk_secret_sem);\n"
  " \t\tkey_put(master_key);\n"
  " \t}\n"
- " \tif (res = -ENOKEY)\n"
+ " \tif (res == -ENOKEY)\n"
  "diff --git a/include/uapi/linux/fscrypt.h b/include/uapi/linux/fscrypt.h\n"
  "index 26879e669dfa..fd1c3e2b0b7c 100644\n"
  "--- a/include/uapi/linux/fscrypt.h\n"
@@ -641,6 +642,11 @@
  " \n"
  " #define FS_IOC_SET_ENCRYPTION_POLICY\t  _IOR('f', 19, struct fscrypt_policy)\n"
  "-- \n"
- 2.20.1
+ "2.20.1\n"
+ "\n"
+ "\n"
+ "______________________________________________________\n"
+ "Linux MTD discussion mailing list\n"
+ http://lists.infradead.org/mailman/listinfo/linux-mtd/
 
-7c81d4807c457bd34f32d661c4d8d3701b2468049184fd45cb8b8646b69f0ee5
+27ce4f8b3fd6cbf4b2b7d5ea7ecb270aa41aeaff80f56348cc0afe48d4fe79d3

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.