diff for duplicates of <20200925045146.1283714-4-hch@lst.de>

diff --git a/a/1.txt b/N1/1.txt
index 7d9222c..6b6d3ba 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -151,8 +151,7 @@ index ccea9db3f72be8..d5d8afe31fca16 100644
 +static int copy_compat_iovec_from_user(struct iovec *iov,
 +		const struct iovec __user *uvec, unsigned long nr_segs)
 +{
-+	const struct compat_iovec __user *uiov =
-+		(const struct compat_iovec __user *)uvec;
++	const struct compat_iovec __user *uiov +		(const struct compat_iovec __user *)uvec;
 +	int ret = -EFAULT, i;
 +
 +	if (!user_access_begin(uvec, nr_segs * sizeof(*uvec)))
@@ -192,7 +191,7 @@ index ccea9db3f72be8..d5d8afe31fca16 100644
 -	 * was less than or equal to 0, or greater than {IOV_MAX}.  Linux has
 -	 * traditionally returned zero for zero segments, so...
 -	 */
--	if (nr_segs == 0) {
+-	if (nr_segs = 0) {
 -		ret = 0;
 -		goto out;
 +	if (copy_from_user(iov, uvec, nr_segs * sizeof(*uvec)))
@@ -223,13 +222,13 @@ index ccea9db3f72be8..d5d8afe31fca16 100644
 -		ret = -EINVAL;
 -		goto out;
 -	}
-+	if (nr_segs == 0)
++	if (nr_segs = 0)
 +		return iov;
 +	if (nr_segs > UIO_MAXIOV)
 +		return ERR_PTR(-EINVAL);
  	if (nr_segs > fast_segs) {
  		iov = kmalloc_array(nr_segs, sizeof(struct iovec), GFP_KERNEL);
--		if (iov == NULL) {
+-		if (iov = NULL) {
 -			ret = -ENOMEM;
 -			goto out;
 -		}
@@ -315,7 +314,7 @@ index ccea9db3f72be8..d5d8afe31fca16 100644
 -	return ret;
 +
 +	iov_iter_init(i, type, iov, nr_segs, total_len);
-+	if (iov == *iovp)
++	if (iov = *iovp)
 +		*iovp = NULL;
 +	else
 +		*iovp = iov;
@@ -357,7 +356,7 @@ index ccea9db3f72be8..d5d8afe31fca16 100644
 -		return n;
 -	}
 -	iov_iter_init(i, type, p, nr_segs, n);
--	*iov = p == *iov ? NULL : p;
+-	*iov = p = *iov ? NULL : p;
 -	return n;
 +	return __import_iovec(type, uvec, nr_segs, fast_segs, iovp, i, false);
  }
@@ -381,7 +380,7 @@ index ccea9db3f72be8..d5d8afe31fca16 100644
 -	 * was less than or equal to 0, or greater than {IOV_MAX}.  Linux has
 -	 * traditionally returned zero for zero segments, so...
 -	 */
--	if (nr_segs == 0)
+-	if (nr_segs = 0)
 -		goto out;
 -
 -	ret = -EINVAL;
@@ -390,7 +389,7 @@ index ccea9db3f72be8..d5d8afe31fca16 100644
 -	if (nr_segs > fast_segs) {
 -		ret = -ENOMEM;
 -		iov = kmalloc_array(nr_segs, sizeof(struct iovec), GFP_KERNEL);
--		if (iov == NULL)
+-		if (iov = NULL)
 -			goto out;
 -	}
 -	*ret_pointer = iov;
@@ -458,7 +457,7 @@ index ccea9db3f72be8..d5d8afe31fca16 100644
 -		return n;
 -	}
 -	iov_iter_init(i, type, p, nr_segs, n);
--	*iov = p == *iov ? NULL : p;
+-	*iov = p = *iov ? NULL : p;
 -	return n;
 +	return __import_iovec(type, (const struct iovec __user *)uvec, nr_segs,
 +			     fast_segs, iovp, i, true);
diff --git a/a/content_digest b/N1/content_digest
index a39bcf9..d46e9d0 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
   "Subject\0[PATCH 3/9] iov_iter: refactor rw_copy_check_uvector and import_iovec\0"
 ]
 [
-  "Date\0Fri, 25 Sep 2020 06:51:40 +0200\0"
+  "Date\0Fri, 25 Sep 2020 04:51:40 +0000\0"
 ]
 [
   "To\0Alexander Viro <viro\@zeniv.linux.org.uk>\0"
@@ -197,8 +197,7 @@
   "+static int copy_compat_iovec_from_user(struct iovec *iov,\n",
   "+\t\tconst struct iovec __user *uvec, unsigned long nr_segs)\n",
   "+{\n",
-  "+\tconst struct compat_iovec __user *uiov =\n",
-  "+\t\t(const struct compat_iovec __user *)uvec;\n",
+  "+\tconst struct compat_iovec __user *uiov +\t\t(const struct compat_iovec __user *)uvec;\n",
   "+\tint ret = -EFAULT, i;\n",
   "+\n",
   "+\tif (!user_access_begin(uvec, nr_segs * sizeof(*uvec)))\n",
@@ -238,7 +237,7 @@
   "-\t * was less than or equal to 0, or greater than {IOV_MAX}.  Linux has\n",
   "-\t * traditionally returned zero for zero segments, so...\n",
   "-\t */\n",
-  "-\tif (nr_segs == 0) {\n",
+  "-\tif (nr_segs = 0) {\n",
   "-\t\tret = 0;\n",
   "-\t\tgoto out;\n",
   "+\tif (copy_from_user(iov, uvec, nr_segs * sizeof(*uvec)))\n",
@@ -269,13 +268,13 @@
   "-\t\tret = -EINVAL;\n",
   "-\t\tgoto out;\n",
   "-\t}\n",
-  "+\tif (nr_segs == 0)\n",
+  "+\tif (nr_segs = 0)\n",
   "+\t\treturn iov;\n",
   "+\tif (nr_segs > UIO_MAXIOV)\n",
   "+\t\treturn ERR_PTR(-EINVAL);\n",
   " \tif (nr_segs > fast_segs) {\n",
   " \t\tiov = kmalloc_array(nr_segs, sizeof(struct iovec), GFP_KERNEL);\n",
-  "-\t\tif (iov == NULL) {\n",
+  "-\t\tif (iov = NULL) {\n",
   "-\t\t\tret = -ENOMEM;\n",
   "-\t\t\tgoto out;\n",
   "-\t\t}\n",
@@ -361,7 +360,7 @@
   "-\treturn ret;\n",
   "+\n",
   "+\tiov_iter_init(i, type, iov, nr_segs, total_len);\n",
-  "+\tif (iov == *iovp)\n",
+  "+\tif (iov = *iovp)\n",
   "+\t\t*iovp = NULL;\n",
   "+\telse\n",
   "+\t\t*iovp = iov;\n",
@@ -403,7 +402,7 @@
   "-\t\treturn n;\n",
   "-\t}\n",
   "-\tiov_iter_init(i, type, p, nr_segs, n);\n",
-  "-\t*iov = p == *iov ? NULL : p;\n",
+  "-\t*iov = p = *iov ? NULL : p;\n",
   "-\treturn n;\n",
   "+\treturn __import_iovec(type, uvec, nr_segs, fast_segs, iovp, i, false);\n",
   " }\n",
@@ -427,7 +426,7 @@
   "-\t * was less than or equal to 0, or greater than {IOV_MAX}.  Linux has\n",
   "-\t * traditionally returned zero for zero segments, so...\n",
   "-\t */\n",
-  "-\tif (nr_segs == 0)\n",
+  "-\tif (nr_segs = 0)\n",
   "-\t\tgoto out;\n",
   "-\n",
   "-\tret = -EINVAL;\n",
@@ -436,7 +435,7 @@
   "-\tif (nr_segs > fast_segs) {\n",
   "-\t\tret = -ENOMEM;\n",
   "-\t\tiov = kmalloc_array(nr_segs, sizeof(struct iovec), GFP_KERNEL);\n",
-  "-\t\tif (iov == NULL)\n",
+  "-\t\tif (iov = NULL)\n",
   "-\t\t\tgoto out;\n",
   "-\t}\n",
   "-\t*ret_pointer = iov;\n",
@@ -504,7 +503,7 @@
   "-\t\treturn n;\n",
   "-\t}\n",
   "-\tiov_iter_init(i, type, p, nr_segs, n);\n",
-  "-\t*iov = p == *iov ? NULL : p;\n",
+  "-\t*iov = p = *iov ? NULL : p;\n",
   "-\treturn n;\n",
   "+\treturn __import_iovec(type, (const struct iovec __user *)uvec, nr_segs,\n",
   "+\t\t\t     fast_segs, iovp, i, true);\n",
@@ -574,4 +573,4 @@
   "2.28.0"
 ]
 
-ad3e4ab1119a09ca82fe93a3f922bdc40a292ad6ec976341ab6c32744a391e39
+37804849bff91c10ec5bcf2954225fef2e12b29fc4e4fd383db0e4d6280abd51
