diff for duplicates of <20200505110358.GC17400@lst.de> diff --git a/a/1.txt b/N1/1.txt index 0da5451..0b90bac 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,7 +61,7 @@ On Wed, Apr 29, 2020 at 11:49:53PM +0200, Jann Horn wrote: > + * up later in vma_dump_size_fixup(). > */ > if (FILTER(ELF_HEADERS) && -> - vma->vm_pgoff = 0 && (vma->vm_flags & VM_READ)) { +> - vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) { > - u32 __user *header = (u32 __user *) vma->vm_start; > - u32 word; > - /* @@ -78,10 +78,10 @@ On Wed, Apr 29, 2020 at 11:49:53PM +0200, Jann Horn wrote: > - magic.elfmag[EI_MAG3] = ELFMAG3; > - if (unlikely(get_user(word, header))) > - word = 0; -> - if (word = magic.cmp) +> - if (word == magic.cmp) > - return PAGE_SIZE; > - } -> + vma->vm_pgoff = 0 && (vma->vm_flags & VM_READ)) +> + vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) > + return DUMP_SIZE_MAYBE_ELFHDR_PLACEHOLDER; > > #undef FILTER @@ -102,7 +102,8 @@ On Wed, Apr 29, 2020 at 11:49:53PM +0200, Jann Horn wrote: > + meta->dump_size = 0; > + return; > + } -> + meta->dump_size > + (memcmp(elfmag, ELFMAG, SELFMAG) = 0) ? PAGE_SIZE : 0; +> + meta->dump_size = +> + (memcmp(elfmag, ELFMAG, SELFMAG) == 0) ? PAGE_SIZE : 0; > +} While this code looks entirely correct, it took me way too long to @@ -159,3 +160,8 @@ opening brace, pick your poison :)) This looks a little weird. Why not kcalloc + just initialize the four fields we actually fill out here? + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index e55991b..6cb8198 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020200429214954.44866-5-jannh@google.com\0" "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0Re: [PATCH v2 4/5] binfmt_elf, binfmt_elf_fdpic: Use a VMA list snapshot\0" - "Date\0Tue, 05 May 2020 11:03:58 +0000\0" + "Date\0Tue, 5 May 2020 13:03:58 +0200\0" "To\0Jann Horn <jannh@google.com>\0" "Cc\0Rich Felker <dalias@libc.org>" linux-c6x-dev@linux-c6x.org @@ -86,7 +86,7 @@ "> +\t * up later in vma_dump_size_fixup().\n" "> \t */\n" "> \tif (FILTER(ELF_HEADERS) &&\n" - "> -\t vma->vm_pgoff = 0 && (vma->vm_flags & VM_READ)) {\n" + "> -\t vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {\n" "> -\t\tu32 __user *header = (u32 __user *) vma->vm_start;\n" "> -\t\tu32 word;\n" "> -\t\t/*\n" @@ -103,10 +103,10 @@ "> -\t\tmagic.elfmag[EI_MAG3] = ELFMAG3;\n" "> -\t\tif (unlikely(get_user(word, header)))\n" "> -\t\t\tword = 0;\n" - "> -\t\tif (word = magic.cmp)\n" + "> -\t\tif (word == magic.cmp)\n" "> -\t\t\treturn PAGE_SIZE;\n" "> -\t}\n" - "> +\t vma->vm_pgoff = 0 && (vma->vm_flags & VM_READ))\n" + "> +\t vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ))\n" "> +\t\treturn DUMP_SIZE_MAYBE_ELFHDR_PLACEHOLDER;\n" "> \n" "> #undef\tFILTER\n" @@ -127,7 +127,8 @@ "> +\t\tmeta->dump_size = 0;\n" "> +\t\treturn;\n" "> +\t}\n" - "> +\tmeta->dump_size > +\t\t(memcmp(elfmag, ELFMAG, SELFMAG) = 0) ? PAGE_SIZE : 0;\n" + "> +\tmeta->dump_size =\n" + "> +\t\t(memcmp(elfmag, ELFMAG, SELFMAG) == 0) ? PAGE_SIZE : 0;\n" "> +}\n" "\n" "While this code looks entirely correct, it took me way too long to\n" @@ -183,6 +184,11 @@ "> +\t\t};\n" "\n" "This looks a little weird. Why not kcalloc + just initialize the four\n" - fields we actually fill out here? + "fields we actually fill out here?\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -c2e8e51e9306ce7eef8a89ec1a8f473df1de1463ec23587ba81042a1aa5cd649 +4eb83fe4b3fa755fafa61de0ef7922a258197e0109e6e85a522cbf377ba32695
diff --git a/a/1.txt b/N2/1.txt index 0da5451..5e1c0c3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -61,7 +61,7 @@ On Wed, Apr 29, 2020 at 11:49:53PM +0200, Jann Horn wrote: > + * up later in vma_dump_size_fixup(). > */ > if (FILTER(ELF_HEADERS) && -> - vma->vm_pgoff = 0 && (vma->vm_flags & VM_READ)) { +> - vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) { > - u32 __user *header = (u32 __user *) vma->vm_start; > - u32 word; > - /* @@ -78,10 +78,10 @@ On Wed, Apr 29, 2020 at 11:49:53PM +0200, Jann Horn wrote: > - magic.elfmag[EI_MAG3] = ELFMAG3; > - if (unlikely(get_user(word, header))) > - word = 0; -> - if (word = magic.cmp) +> - if (word == magic.cmp) > - return PAGE_SIZE; > - } -> + vma->vm_pgoff = 0 && (vma->vm_flags & VM_READ)) +> + vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) > + return DUMP_SIZE_MAYBE_ELFHDR_PLACEHOLDER; > > #undef FILTER @@ -102,7 +102,8 @@ On Wed, Apr 29, 2020 at 11:49:53PM +0200, Jann Horn wrote: > + meta->dump_size = 0; > + return; > + } -> + meta->dump_size > + (memcmp(elfmag, ELFMAG, SELFMAG) = 0) ? PAGE_SIZE : 0; +> + meta->dump_size = +> + (memcmp(elfmag, ELFMAG, SELFMAG) == 0) ? PAGE_SIZE : 0; > +} While this code looks entirely correct, it took me way too long to diff --git a/a/content_digest b/N2/content_digest index e55991b..6804966 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,25 +2,25 @@ "ref\020200429214954.44866-5-jannh@google.com\0" "From\0Christoph Hellwig <hch@lst.de>\0" "Subject\0Re: [PATCH v2 4/5] binfmt_elf, binfmt_elf_fdpic: Use a VMA list snapshot\0" - "Date\0Tue, 05 May 2020 11:03:58 +0000\0" + "Date\0Tue, 5 May 2020 13:03:58 +0200\0" "To\0Jann Horn <jannh@google.com>\0" - "Cc\0Rich Felker <dalias@libc.org>" - linux-c6x-dev@linux-c6x.org - Yoshinori Sato <ysato@users.sourceforge.jp> - linux-sh@vger.kernel.org + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + Linus Torvalds <torvalds@linux-foundation.org> + Christoph Hellwig <hch@lst.de> linux-kernel@vger.kernel.org - Oleg Nesterov <oleg@redhat.com> linux-mm@kvack.org - Alexander Viro <viro@zeniv.linux.org.uk> - Mark Salter <msalter@redhat.com> linux-fsdevel@vger.kernel.org + Alexander Viro <viro@zeniv.linux.org.uk> + Eric W . Biederman <ebiederm@xmission.com> + Oleg Nesterov <oleg@redhat.com> Russell King <linux@armlinux.org.uk> - Andrew Morton <akpm@linux-foundation.org> - Aurelien Jacquiot <jacquiot.aurelien@gmail.com> - Linus Torvalds <torvalds@linux-foundation.org> - Christoph Hellwig <hch@lst.de> linux-arm-kernel@lists.infradead.org - " Eric W . Biederman <ebiederm@xmission.com>\0" + Mark Salter <msalter@redhat.com> + Aurelien Jacquiot <jacquiot.aurelien@gmail.com> + linux-c6x-dev@linux-c6x.org + Yoshinori Sato <ysato@users.sourceforge.jp> + Rich Felker <dalias@libc.org> + " linux-sh@vger.kernel.org\0" "\00:1\0" "b\0" "On Wed, Apr 29, 2020 at 11:49:53PM +0200, Jann Horn wrote:\n" @@ -86,7 +86,7 @@ "> +\t * up later in vma_dump_size_fixup().\n" "> \t */\n" "> \tif (FILTER(ELF_HEADERS) &&\n" - "> -\t vma->vm_pgoff = 0 && (vma->vm_flags & VM_READ)) {\n" + "> -\t vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ)) {\n" "> -\t\tu32 __user *header = (u32 __user *) vma->vm_start;\n" "> -\t\tu32 word;\n" "> -\t\t/*\n" @@ -103,10 +103,10 @@ "> -\t\tmagic.elfmag[EI_MAG3] = ELFMAG3;\n" "> -\t\tif (unlikely(get_user(word, header)))\n" "> -\t\t\tword = 0;\n" - "> -\t\tif (word = magic.cmp)\n" + "> -\t\tif (word == magic.cmp)\n" "> -\t\t\treturn PAGE_SIZE;\n" "> -\t}\n" - "> +\t vma->vm_pgoff = 0 && (vma->vm_flags & VM_READ))\n" + "> +\t vma->vm_pgoff == 0 && (vma->vm_flags & VM_READ))\n" "> +\t\treturn DUMP_SIZE_MAYBE_ELFHDR_PLACEHOLDER;\n" "> \n" "> #undef\tFILTER\n" @@ -127,7 +127,8 @@ "> +\t\tmeta->dump_size = 0;\n" "> +\t\treturn;\n" "> +\t}\n" - "> +\tmeta->dump_size > +\t\t(memcmp(elfmag, ELFMAG, SELFMAG) = 0) ? PAGE_SIZE : 0;\n" + "> +\tmeta->dump_size =\n" + "> +\t\t(memcmp(elfmag, ELFMAG, SELFMAG) == 0) ? PAGE_SIZE : 0;\n" "> +}\n" "\n" "While this code looks entirely correct, it took me way too long to\n" @@ -185,4 +186,4 @@ "This looks a little weird. Why not kcalloc + just initialize the four\n" fields we actually fill out here? -c2e8e51e9306ce7eef8a89ec1a8f473df1de1463ec23587ba81042a1aa5cd649 +c654d21387ad87005ccf30b4e591241eac0a61d7c62cfcc10a40232f9198b3d6
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.