diff for duplicates of <lsq.1510009382.193570306@decadent.org.uk>
diff --git a/a/1.txt b/N1/1.txt
index 1a7a4b2..c95f1c4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -8,7 +8,7 @@ commit eaa2f87c6b840b83827c40db6eb8481689570259 upstream.
ldt->entries[] is allocated in alloc_ldt_struct(). It has
ldt->nr_entries elements and ldt->nr_entries is capped at LDT_ENTRIES.
-So if "idx" is == ldt->nr_entries then we're reading beyond the end of
+So if "idx" is = ldt->nr_entries then we're reading beyond the end of
the buffer. It seems duplicative to have two limit checks when one
would work just as well so I removed the check against LDT_ENTRIES.
@@ -34,7 +34,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -2009,17 +2009,14 @@ static unsigned long get_segment_base(un
- if ((segment & SEGMENT_TI_MASK) == SEGMENT_LDT) {
+ if ((segment & SEGMENT_TI_MASK) = SEGMENT_LDT) {
struct ldt_struct *ldt;
- if (idx > LDT_ENTRIES)
diff --git a/a/content_digest b/N1/content_digest
index 28c64fd..31f6e63 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -43,7 +43,7 @@
"\n",
"ldt->entries[] is allocated in alloc_ldt_struct(). It has\n",
"ldt->nr_entries elements and ldt->nr_entries is capped at LDT_ENTRIES.\n",
- "So if \"idx\" is == ldt->nr_entries then we're reading beyond the end of\n",
+ "So if \"idx\" is = ldt->nr_entries then we're reading beyond the end of\n",
"the buffer. It seems duplicative to have two limit checks when one\n",
"would work just as well so I removed the check against LDT_ENTRIES.\n",
"\n",
@@ -69,7 +69,7 @@
"--- a/arch/x86/kernel/cpu/perf_event.c\n",
"+++ b/arch/x86/kernel/cpu/perf_event.c\n",
"\@\@ -2009,17 +2009,14 \@\@ static unsigned long get_segment_base(un\n",
- " \tif ((segment & SEGMENT_TI_MASK) == SEGMENT_LDT) {\n",
+ " \tif ((segment & SEGMENT_TI_MASK) = SEGMENT_LDT) {\n",
" \t\tstruct ldt_struct *ldt;\n",
" \n",
"-\t\tif (idx > LDT_ENTRIES)\n",
@@ -90,4 +90,4 @@
" \t\tdesc = __this_cpu_ptr(&gdt_page.gdt[0]) + idx;"
]
-773dfc50227a16cfe8b9b83c1cfa0f7f68fd6c9d007dba4f882bb2dc52053b5e
+cdbd036e45d1c1946bb1cdeb342d1ed60d9aee3e759848f985c7bf5b2dc1ef6e
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.