diff for duplicates of <20170623101544.c5bvwe5cd6e46bd5@mwanda> diff --git a/a/1.txt b/N1/1.txt index 3985894..7fa22eb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,7 +11,7 @@ index 2ebc328bda96..a03130a47b85 100644 @@ -273,7 +273,8 @@ static int do_tls_getsockopt_tx(struct sock *sk, char __user *optval, } - if (len = sizeof(crypto_info)) { + if (len == sizeof(crypto_info)) { - rc = copy_to_user(optval, crypto_info, sizeof(*crypto_info)); + if (copy_to_user(optval, crypto_info, sizeof(*crypto_info))) + rc = -EFAULT; diff --git a/a/content_digest b/N1/content_digest index 46cafb5..469afc5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[PATCH -net] tls: return -EFAULT if copy_to_user() fails\0" - "Date\0Fri, 23 Jun 2017 10:15:44 +0000\0" + "Date\0Fri, 23 Jun 2017 13:15:44 +0300\0" "To\0Dave Watson <davejwatson@fb.com>\0" "Cc\0Aviad Yehezkel <aviadye@mellanox.com>" Ilya Lesokhin <ilyal@mellanox.com> @@ -22,7 +22,7 @@ "@@ -273,7 +273,8 @@ static int do_tls_getsockopt_tx(struct sock *sk, char __user *optval,\n" " \t}\n" " \n" - " \tif (len = sizeof(crypto_info)) {\n" + " \tif (len == sizeof(crypto_info)) {\n" "-\t\trc = copy_to_user(optval, crypto_info, sizeof(*crypto_info));\n" "+\t\tif (copy_to_user(optval, crypto_info, sizeof(*crypto_info)))\n" "+\t\t\trc = -EFAULT;\n" @@ -44,4 +44,4 @@ " \t}\n" " \tdefault:" -fcc705a6865f64fc87d809720264eb8841cd51cd41b4025d392f93b49175f74c +e07ba9760f88b95c8852c7060db3424a8d74151e90ac11276cbc9e973c1f9745
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.