diff for duplicates of <20150915103525.GA20813@mwanda> diff --git a/a/1.txt b/N1/1.txt index 1978a6c..2a75d74 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,7 +37,7 @@ index 6777d6b..ce01dee 100644 index = link_info.port_number; @@ -1080,9 +1079,10 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) case HFI1_SNOOP_IOCGETLINKSTATE_EXTRA: - if (cmd = HFI1_SNOOP_IOCGETLINKSTATE_EXTRA) { + if (cmd == HFI1_SNOOP_IOCGETLINKSTATE_EXTRA) { memset(&link_info, 0, sizeof(link_info)); - ret = copy_from_user(&link_info, + if (copy_from_user(&link_info, @@ -50,7 +50,8 @@ index 6777d6b..ce01dee 100644 ret = __get_user(index, (int __user *) arg); @@ -1114,9 +1114,10 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg) ppd->link_speed_active; - link_info.link_width_active ppd->link_width_active; + link_info.link_width_active = + ppd->link_width_active; - ret = copy_to_user( + if (copy_to_user( (struct hfi1_link_info __user *)arg, diff --git a/a/content_digest b/N1/content_digest index 93d4c69..a1dbe5f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] IB/hfi1: fix copy_to/from_user() error handling\0" - "Date\0Tue, 15 Sep 2015 10:35:25 +0000\0" + "Date\0Tue, 15 Sep 2015 13:35:25 +0300\0" "To\0Mike Marciniszyn <infinipath@intel.com>\0" "Cc\0devel@driverdev.osuosl.org" linux-rdma@vger.kernel.org @@ -50,7 +50,7 @@ " \t\t\tindex = link_info.port_number;\n" "@@ -1080,9 +1079,10 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)\n" " \t\tcase HFI1_SNOOP_IOCGETLINKSTATE_EXTRA:\n" - " \t\t\tif (cmd = HFI1_SNOOP_IOCGETLINKSTATE_EXTRA) {\n" + " \t\t\tif (cmd == HFI1_SNOOP_IOCGETLINKSTATE_EXTRA) {\n" " \t\t\t\tmemset(&link_info, 0, sizeof(link_info));\n" "-\t\t\t\tret = copy_from_user(&link_info,\n" "+\t\t\t\tif (copy_from_user(&link_info,\n" @@ -63,7 +63,8 @@ " \t\t\t\tret = __get_user(index, (int __user *) arg);\n" "@@ -1114,9 +1114,10 @@ static long hfi1_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)\n" " \t\t\t\t\t\t\tppd->link_speed_active;\n" - " \t\t\t\tlink_info.link_width_active \t\t\t\t\t\t\tppd->link_width_active;\n" + " \t\t\t\tlink_info.link_width_active =\n" + " \t\t\t\t\t\t\tppd->link_width_active;\n" "-\t\t\t\tret = copy_to_user(\n" "+\t\t\t\tif (copy_to_user(\n" " \t\t\t\t\t(struct hfi1_link_info __user *)arg,\n" @@ -104,4 +105,4 @@ " \t\t\t}\n" " \t\t\t/* Drain packets first */" -ef262e6f748634cd4ab14642708086841309bc8c02ce2eb303e4d2abe78d032b +aa42c0cdf7d19afd4637e745fc22a7f75835855cef09dccea3de6ebed742031d
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.