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

diff --git a/a/1.txt b/N1/1.txt
index 853057d..34bf098 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -401,7 +401,7 @@ index fb1d247898f93..0a92f2998b437 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
@@ -437,7 +437,7 @@ index fb1d247898f93..0a92f2998b437 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;
  
@@ -522,7 +522,8 @@ index fb1d247898f93..0a92f2998b437 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);
@@ -606,7 +607,7 @@ index e88524b730ac0..29ad2416955ee 100644
 +		up_read(&mk->mk_secret_sem);
  		key_put(master_key);
  	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
 @@ -546,7 +548,7 @@ int fscrypt_drop_inode(struct inode *inode)
  	mk = ci->ci_master_key->payload.data[0];
  
diff --git a/a/content_digest b/N1/content_digest
index b2b738c..e42c680 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\020190520172552.217253-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
  "Subject\0[PATCH v6 11/16] fscrypt: allow unprivileged users to add/remove keys for v2 policies\0"
- "Date\0Mon, 20 May 2019 17:25:47 +0000\0"
+ "Date\0Mon, 20 May 2019 10:25:47 -0700\0"
  "To\0linux-fscrypt@vger.kernel.org\0"
  "Cc\0linux-ext4@vger.kernel.org"
   linux-api@vger.kernel.org
@@ -417,7 +417,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"
@@ -453,7 +453,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"
@@ -538,7 +538,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"
@@ -622,7 +623,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"
  "@@ -546,7 +548,7 @@ int fscrypt_drop_inode(struct inode *inode)\n"
  " \tmk = ci->ci_master_key->payload.data[0];\n"
  " \n"
@@ -662,4 +663,4 @@
  "-- \n"
  2.21.0.1020.gf2820cf01a-goog
 
-109de2cf9055167bcfbef169951252d9b537306a0a6c4e2393255bdd3c9049a5
+c8966b87cb25b073feb28e085ae4c2efa6ba65a0e5ee3061f8da6069310005ba

diff --git a/a/1.txt b/N2/1.txt
index 853057d..34bf098 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -401,7 +401,7 @@ index fb1d247898f93..0a92f2998b437 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
@@ -437,7 +437,7 @@ index fb1d247898f93..0a92f2998b437 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;
  
@@ -522,7 +522,8 @@ index fb1d247898f93..0a92f2998b437 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);
@@ -606,7 +607,7 @@ index e88524b730ac0..29ad2416955ee 100644
 +		up_read(&mk->mk_secret_sem);
  		key_put(master_key);
  	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
 @@ -546,7 +548,7 @@ int fscrypt_drop_inode(struct inode *inode)
  	mk = ci->ci_master_key->payload.data[0];
  
diff --git a/a/content_digest b/N2/content_digest
index b2b738c..bdf86e5 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,16 +1,16 @@
  "ref\020190520172552.217253-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
  "Subject\0[PATCH v6 11/16] fscrypt: allow unprivileged users to add/remove keys for v2 policies\0"
- "Date\0Mon, 20 May 2019 17:25:47 +0000\0"
+ "Date\0Mon, 20 May 2019 10:25:47 -0700\0"
  "To\0linux-fscrypt@vger.kernel.org\0"
- "Cc\0linux-ext4@vger.kernel.org"
+ "Cc\0Satya Tangirala <satyat@google.com>"
   linux-api@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
-  Satya Tangirala <satyat@google.com>
+  linux-ext4@vger.kernel.org
  " Paul Crowley <paulcrowley@google.com>\0"
  "\00:1\0"
  "b\0"
@@ -417,7 +417,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"
@@ -453,7 +453,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"
@@ -538,7 +538,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"
@@ -622,7 +623,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"
  "@@ -546,7 +548,7 @@ int fscrypt_drop_inode(struct inode *inode)\n"
  " \tmk = ci->ci_master_key->payload.data[0];\n"
  " \n"
@@ -662,4 +663,4 @@
  "-- \n"
  2.21.0.1020.gf2820cf01a-goog
 
-109de2cf9055167bcfbef169951252d9b537306a0a6c4e2393255bdd3c9049a5
+db7115d489b4c3cb309a72e6b4db75e696c71c36501e4bc913a0e5e1c15cd2ef

diff --git a/a/1.txt b/N3/1.txt
index 853057d..d49a87c 100644
--- a/a/1.txt
+++ b/N3/1.txt
@@ -401,7 +401,7 @@ index fb1d247898f93..0a92f2998b437 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
@@ -437,7 +437,7 @@ index fb1d247898f93..0a92f2998b437 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;
  
@@ -522,7 +522,8 @@ index fb1d247898f93..0a92f2998b437 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);
@@ -606,7 +607,7 @@ index e88524b730ac0..29ad2416955ee 100644
 +		up_read(&mk->mk_secret_sem);
  		key_put(master_key);
  	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
 @@ -546,7 +548,7 @@ int fscrypt_drop_inode(struct inode *inode)
  	mk = ci->ci_master_key->payload.data[0];
  
@@ -645,3 +646,10 @@ index 26879e669dfa0..fd1c3e2b0b7c1 100644
  #define FS_IOC_SET_ENCRYPTION_POLICY	  _IOR('f', 19, struct fscrypt_policy)
 -- 
 2.21.0.1020.gf2820cf01a-goog
+
+
+
+_______________________________________________
+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 b2b738c..0a4e15c 100644
--- a/a/content_digest
+++ b/N3/content_digest
@@ -1,7 +1,7 @@
  "ref\020190520172552.217253-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
- "Subject\0[PATCH v6 11/16] fscrypt: allow unprivileged users to add/remove keys for v2 policies\0"
- "Date\0Mon, 20 May 2019 17:25:47 +0000\0"
+ "Subject\0[f2fs-dev] [PATCH v6 11/16] fscrypt: allow unprivileged users to add/remove keys for v2 policies\0"
+ "Date\0Mon, 20 May 2019 10:25:47 -0700\0"
  "To\0linux-fscrypt@vger.kernel.org\0"
  "Cc\0linux-ext4@vger.kernel.org"
   linux-api@vger.kernel.org
@@ -417,7 +417,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"
@@ -453,7 +453,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"
@@ -538,7 +538,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"
@@ -622,7 +623,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"
  "@@ -546,7 +548,7 @@ int fscrypt_drop_inode(struct inode *inode)\n"
  " \tmk = ci->ci_master_key->payload.data[0];\n"
  " \n"
@@ -660,6 +661,13 @@
  " \n"
  " #define FS_IOC_SET_ENCRYPTION_POLICY\t  _IOR('f', 19, struct fscrypt_policy)\n"
  "-- \n"
- 2.21.0.1020.gf2820cf01a-goog
+ "2.21.0.1020.gf2820cf01a-goog\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
 
-109de2cf9055167bcfbef169951252d9b537306a0a6c4e2393255bdd3c9049a5
+0de27d5dc391b4d1e59a53fba4d1e2adf068d5303db28ce14028ee4d9e06366e

diff --git a/a/1.txt b/N4/1.txt
index 853057d..863904f 100644
--- a/a/1.txt
+++ b/N4/1.txt
@@ -401,7 +401,7 @@ index fb1d247898f93..0a92f2998b437 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
@@ -437,7 +437,7 @@ index fb1d247898f93..0a92f2998b437 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;
  
@@ -522,7 +522,8 @@ index fb1d247898f93..0a92f2998b437 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);
@@ -606,7 +607,7 @@ index e88524b730ac0..29ad2416955ee 100644
 +		up_read(&mk->mk_secret_sem);
  		key_put(master_key);
  	}
- 	if (res = -ENOKEY)
+ 	if (res == -ENOKEY)
 @@ -546,7 +548,7 @@ int fscrypt_drop_inode(struct inode *inode)
  	mk = ci->ci_master_key->payload.data[0];
  
@@ -645,3 +646,8 @@ index 26879e669dfa0..fd1c3e2b0b7c1 100644
  #define FS_IOC_SET_ENCRYPTION_POLICY	  _IOR('f', 19, struct fscrypt_policy)
 -- 
 2.21.0.1020.gf2820cf01a-goog
+
+
+______________________________________________________
+Linux MTD discussion mailing list
+http://lists.infradead.org/mailman/listinfo/linux-mtd/
diff --git a/a/content_digest b/N4/content_digest
index b2b738c..c147e3e 100644
--- a/a/content_digest
+++ b/N4/content_digest
@@ -1,7 +1,7 @@
  "ref\020190520172552.217253-1-ebiggers@kernel.org\0"
  "From\0Eric Biggers <ebiggers@kernel.org>\0"
  "Subject\0[PATCH v6 11/16] fscrypt: allow unprivileged users to add/remove keys for v2 policies\0"
- "Date\0Mon, 20 May 2019 17:25:47 +0000\0"
+ "Date\0Mon, 20 May 2019 10:25:47 -0700\0"
  "To\0linux-fscrypt@vger.kernel.org\0"
  "Cc\0linux-ext4@vger.kernel.org"
   linux-api@vger.kernel.org
@@ -417,7 +417,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"
@@ -453,7 +453,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"
@@ -538,7 +538,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"
@@ -622,7 +623,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"
  "@@ -546,7 +548,7 @@ int fscrypt_drop_inode(struct inode *inode)\n"
  " \tmk = ci->ci_master_key->payload.data[0];\n"
  " \n"
@@ -660,6 +661,11 @@
  " \n"
  " #define FS_IOC_SET_ENCRYPTION_POLICY\t  _IOR('f', 19, struct fscrypt_policy)\n"
  "-- \n"
- 2.21.0.1020.gf2820cf01a-goog
+ "2.21.0.1020.gf2820cf01a-goog\n"
+ "\n"
+ "\n"
+ "______________________________________________________\n"
+ "Linux MTD discussion mailing list\n"
+ http://lists.infradead.org/mailman/listinfo/linux-mtd/
 
-109de2cf9055167bcfbef169951252d9b537306a0a6c4e2393255bdd3c9049a5
+e60a91d432a2bbd851506fc8c520bbc83d0c32e1b332185b93271153015c2d40

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.