diff for duplicates of <20120901195407.GF20741@mwanda> diff --git a/a/1.txt b/N1/1.txt index 23170ae..aafe548 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -18,14 +18,14 @@ index df3016b..0735fb7 100644 char *fmt0 = fmt; struct acpi_object_list params; @@ -606,7 +606,7 @@ static int acpi_evalf(acpi_handle handle, - success = (status = AE_OK && - out_obj.type = ACPI_TYPE_INTEGER); + success = (status == AE_OK && + out_obj.type == ACPI_TYPE_INTEGER); if (success && res) - *(int *)res = out_obj.integer.value; + *res = out_obj.integer.value; break; case 'v': /* void */ - success = status = AE_OK; + success = status == AE_OK; @@ -7386,17 +7386,18 @@ static int fan_get_status(u8 *status) * Add TPACPI_FAN_RD_ACPI_FANS ? */ diff --git a/a/content_digest b/N1/content_digest index 98ba025..3034d63 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] thinkpad_acpi: buffer overflow in fan_get_status()\0" - "Date\0Sat, 01 Sep 2012 19:54:07 +0000\0" + "Date\0Sat, 1 Sep 2012 12:54:07 -0700\0" "To\0Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>\0" "Cc\0Matthew Garrett <mjg@redhat.com>" open list:THINKPAD ACPI EXT... <ibm-acpi-devel@lists.sourceforge.net> @@ -28,14 +28,14 @@ " \tchar *fmt0 = fmt;\n" " \tstruct acpi_object_list params;\n" "@@ -606,7 +606,7 @@ static int acpi_evalf(acpi_handle handle,\n" - " \t\tsuccess = (status = AE_OK &&\n" - " \t\t\t out_obj.type = ACPI_TYPE_INTEGER);\n" + " \t\tsuccess = (status == AE_OK &&\n" + " \t\t\t out_obj.type == ACPI_TYPE_INTEGER);\n" " \t\tif (success && res)\n" "-\t\t\t*(int *)res = out_obj.integer.value;\n" "+\t\t\t*res = out_obj.integer.value;\n" " \t\tbreak;\n" " \tcase 'v':\t\t/* void */\n" - " \t\tsuccess = status = AE_OK;\n" + " \t\tsuccess = status == AE_OK;\n" "@@ -7386,17 +7386,18 @@ static int fan_get_status(u8 *status)\n" " \t * Add TPACPI_FAN_RD_ACPI_FANS ? */\n" " \n" @@ -60,4 +60,4 @@ " \t\t/* all except 570, 600e/x, 770e, 770x */\n" " \t\tif (unlikely(!acpi_ec_read(fan_status_offset, &s)))" -5068a37938792b697fad9662acd7869d16fafc8c53c974a48293871ecd579377 +7149581adf698941f099eeb06ef93812125730961d72289d4917eb5a00fb507a
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.