diff for duplicates of <YKWKbfXwVx0+G0OX@google.com> diff --git a/a/1.txt b/N1/1.txt index 17e14c8..13277ca 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -123,7 +123,7 @@ function. > + goto out_close_fd; > + } > + /* Sanity check for other fields in header */ -> + if (header.count = 0) { +> + if (header.count == 0) { > + err = 0; > + goto out_close_fd; > + } @@ -132,7 +132,7 @@ As mentioned by David, it would be better to replace the checks with TEST_ASSERT's. Most other selftests rely on TEST_ASSERT. > + /* Check overlap */ -> + if (header.desc_offset = 0 || header.data_offset = 0 || +> + if (header.desc_offset == 0 || header.data_offset == 0 || > + header.desc_offset < sizeof(header) || > + header.data_offset < sizeof(header)) { > + printf("Invalid offset fields in header!\n"); @@ -144,7 +144,7 @@ TEST_ASSERT's. Most other selftests rely on TEST_ASSERT. Could you make the check more strict? -TEST_ASSERT(header.desc_offset + size_desc * header.count = header.data_offset, +TEST_ASSERT(header.desc_offset + size_desc * header.count == header.data_offset, "The data block should be at the end of the descriptor block."); > + printf("VM Descriptor block is overlapped with data block!\n"); @@ -236,10 +236,10 @@ cast to (struct kvm_stats_desc *) Tighter check: TEST_ASSERT(header.name_size > 0 && - strlen(pdesc->name) + 1 = header.name_size); + strlen(pdesc->name) + 1 == header.name_size); > + /* Check size field, which should not be zero */ -> + if (pdesc->size = 0) { +> + if (pdesc->size == 0) { > + printf("KVM descriptor(%s) with size of 0!\n", > + pdesc->name); > + goto out_free_desc; @@ -264,7 +264,7 @@ overlap check). Tighter check: -TEST_ASSERT(size_data = header.count * stats_data->value[0]); +TEST_ASSERT(size_data == header.count * stats_data->value[0]); > + > + /* Allocate memory for stats data */ @@ -319,12 +319,12 @@ TEST_ASSERT(size_data = header.count * stats_data->value[0]); > + goto out_close_fd; > + } > + /* Sanity check for other fields in header */ -> + if (header.count = 0) { +> + if (header.count == 0) { > + err = 0; > + goto out_close_fd; > + } > + /* Check overlap */ -> + if (header.desc_offset = 0 || header.data_offset = 0 || +> + if (header.desc_offset == 0 || header.data_offset == 0 || > + header.desc_offset < sizeof(header) || > + header.data_offset < sizeof(header)) { > + printf("Invalid offset fields in header!\n"); @@ -399,7 +399,7 @@ Same as above (tighter check). > + goto out_free_desc; > + } > + /* Check size field, which should not be zero */ -> + if (pdesc->size = 0) { +> + if (pdesc->size == 0) { > + printf("KVM descriptor(%s) with size of 0!\n", > + pdesc->name); > + goto out_free_desc; @@ -529,3 +529,7 @@ Same as above (tighter check). > kvmarm mailing list > kvmarm@lists.cs.columbia.edu > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm +_______________________________________________ +kvmarm mailing list +kvmarm@lists.cs.columbia.edu +https://lists.cs.columbia.edu/mailman/listinfo/kvmarm diff --git a/a/content_digest b/N1/content_digest index fae79c7..8487a21 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,36 +2,33 @@ "ref\020210517145314.157626-5-jingzhangos@google.com\0" "From\0Ricardo Koller <ricarkol@google.com>\0" "Subject\0Re: [PATCH v5 4/4] KVM: selftests: Add selftest for KVM statistics data binary interface\0" - "Date\0Wed, 19 May 2021 22:00:13 +0000\0" + "Date\0Wed, 19 May 2021 15:00:13 -0700\0" "To\0Jing Zhang <jingzhangos@google.com>\0" "Cc\0KVM <kvm@vger.kernel.org>" + David Hildenbrand <david@redhat.com> + Paul Mackerras <paulus@ozlabs.org> + Linuxkselftest <linux-kselftest@vger.kernel.org> + Claudio Imbrenda <imbrenda@linux.ibm.com> + Will Deacon <will@kernel.org> KVMARM <kvmarm@lists.cs.columbia.edu> - LinuxMIPS <linux-mips@vger.kernel.org> - KVMPPC <kvm-ppc@vger.kernel.org> + Emanuele Giuseppe Esposito <eesposit@redhat.com> LinuxS390 <linux-s390@vger.kernel.org> - Linuxkselftest <linux-kselftest@vger.kernel.org> - Paolo Bonzini <pbonzini@redhat.com> + Janosch Frank <frankja@linux.ibm.com> + Oliver Upton <oupton@google.com> Marc Zyngier <maz@kernel.org> - James Morse <james.morse@arm.com> - Julien Thierry <julien.thierry.kdev@gmail.com> - Suzuki K Poulose <suzuki.poulose@arm.com> - Will Deacon <will@kernel.org> Huacai Chen <chenhuacai@kernel.org> + Christian Borntraeger <borntraeger@de.ibm.com> Aleksandar Markovic <aleksandar.qemu.devel@gmail.com> + David Rientjes <rientjes@google.com> + KVMPPC <kvm-ppc@vger.kernel.org> + Jim Mattson <jmattson@google.com> Thomas Bogendoerfer <tsbogend@alpha.franken.de> - Paul Mackerras <paulus@ozlabs.org> - Christian Borntraeger <borntraeger@de.ibm.com> - Janosch Frank <frankja@linux.ibm.com> - David Hildenbrand <david@redhat.com> - Cornelia Huck <cohuck@redhat.com> - Claudio Imbrenda <imbrenda@linux.ibm.com> Sean Christopherson <seanjc@google.com> - Vitaly Kuznetsov <vkuznets@redhat.com> - Jim Mattson <jmattson@google.com> + Cornelia Huck <cohuck@redhat.com> Peter Shier <pshier@google.com> - Oliver Upton <oupton@google.com> - David Rientjes <rientjes@google.com> - " Emanuele Giuseppe Esposito <eesposit@redhat.com>\0" + LinuxMIPS <linux-mips@vger.kernel.org> + Paolo Bonzini <pbonzini@redhat.com> + " Vitaly Kuznetsov <vkuznets@redhat.com>\0" "\00:1\0" "b\0" "On Mon, May 17, 2021 at 02:53:14PM +0000, Jing Zhang wrote:\n" @@ -159,7 +156,7 @@ "> +\t\tgoto out_close_fd;\n" "> +\t}\n" "> +\t/* Sanity check for other fields in header */\n" - "> +\tif (header.count = 0) {\n" + "> +\tif (header.count == 0) {\n" "> +\t\terr = 0;\n" "> +\t\tgoto out_close_fd;\n" "> +\t}\n" @@ -168,7 +165,7 @@ "TEST_ASSERT's. Most other selftests rely on TEST_ASSERT.\n" "\n" "> +\t/* Check overlap */\n" - "> +\tif (header.desc_offset = 0 || header.data_offset = 0 ||\n" + "> +\tif (header.desc_offset == 0 || header.data_offset == 0 ||\n" "> +\t\t\theader.desc_offset < sizeof(header) ||\n" "> +\t\t\theader.data_offset < sizeof(header)) {\n" "> +\t\tprintf(\"Invalid offset fields in header!\\n\");\n" @@ -180,7 +177,7 @@ "\n" "Could you make the check more strict?\n" "\n" - "TEST_ASSERT(header.desc_offset + size_desc * header.count = header.data_offset,\n" + "TEST_ASSERT(header.desc_offset + size_desc * header.count == header.data_offset,\n" "\t\"The data block should be at the end of the descriptor block.\");\n" "\n" "> +\t\tprintf(\"VM Descriptor block is overlapped with data block!\\n\");\n" @@ -272,10 +269,10 @@ "Tighter check:\n" "\n" "TEST_ASSERT(header.name_size > 0 &&\n" - "\tstrlen(pdesc->name) + 1 = header.name_size);\n" + "\tstrlen(pdesc->name) + 1 == header.name_size);\n" "\n" "> +\t\t/* Check size field, which should not be zero */\n" - "> +\t\tif (pdesc->size = 0) {\n" + "> +\t\tif (pdesc->size == 0) {\n" "> +\t\t\tprintf(\"KVM descriptor(%s) with size of 0!\\n\",\n" "> +\t\t\t\t\tpdesc->name);\n" "> +\t\t\tgoto out_free_desc;\n" @@ -300,7 +297,7 @@ "\n" "Tighter check:\n" "\n" - "TEST_ASSERT(size_data = header.count * stats_data->value[0]);\n" + "TEST_ASSERT(size_data == header.count * stats_data->value[0]);\n" "\n" "> +\n" "> +\t/* Allocate memory for stats data */\n" @@ -355,12 +352,12 @@ "> +\t\tgoto out_close_fd;\n" "> +\t}\n" "> +\t/* Sanity check for other fields in header */\n" - "> +\tif (header.count = 0) {\n" + "> +\tif (header.count == 0) {\n" "> +\t\terr = 0;\n" "> +\t\tgoto out_close_fd;\n" "> +\t}\n" "> +\t/* Check overlap */\n" - "> +\tif (header.desc_offset = 0 || header.data_offset = 0 ||\n" + "> +\tif (header.desc_offset == 0 || header.data_offset == 0 ||\n" "> +\t\t\theader.desc_offset < sizeof(header) ||\n" "> +\t\t\theader.data_offset < sizeof(header)) {\n" "> +\t\tprintf(\"Invalid offset fields in header!\\n\");\n" @@ -435,7 +432,7 @@ "> +\t\t\tgoto out_free_desc;\n" "> +\t\t}\n" "> +\t\t/* Check size field, which should not be zero */\n" - "> +\t\tif (pdesc->size = 0) {\n" + "> +\t\tif (pdesc->size == 0) {\n" "> +\t\t\tprintf(\"KVM descriptor(%s) with size of 0!\\n\",\n" "> +\t\t\t\t\tpdesc->name);\n" "> +\t\t\tgoto out_free_desc;\n" @@ -564,6 +561,10 @@ "> _______________________________________________\n" "> kvmarm mailing list\n" "> kvmarm@lists.cs.columbia.edu\n" - > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm + "> https://lists.cs.columbia.edu/mailman/listinfo/kvmarm\n" + "_______________________________________________\n" + "kvmarm mailing list\n" + "kvmarm@lists.cs.columbia.edu\n" + https://lists.cs.columbia.edu/mailman/listinfo/kvmarm -efa5700041d0b5f3356dd827500f44fd2b3787c1bebbcee88ac014ce96def72c +8d593eab8592fce3ad2ec80c26e39021cc1ae4c8b93d2bc4290579d7954ee822
diff --git a/a/1.txt b/N2/1.txt index 17e14c8..3f2fafe 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -123,7 +123,7 @@ function. > + goto out_close_fd; > + } > + /* Sanity check for other fields in header */ -> + if (header.count = 0) { +> + if (header.count == 0) { > + err = 0; > + goto out_close_fd; > + } @@ -132,7 +132,7 @@ As mentioned by David, it would be better to replace the checks with TEST_ASSERT's. Most other selftests rely on TEST_ASSERT. > + /* Check overlap */ -> + if (header.desc_offset = 0 || header.data_offset = 0 || +> + if (header.desc_offset == 0 || header.data_offset == 0 || > + header.desc_offset < sizeof(header) || > + header.data_offset < sizeof(header)) { > + printf("Invalid offset fields in header!\n"); @@ -144,7 +144,7 @@ TEST_ASSERT's. Most other selftests rely on TEST_ASSERT. Could you make the check more strict? -TEST_ASSERT(header.desc_offset + size_desc * header.count = header.data_offset, +TEST_ASSERT(header.desc_offset + size_desc * header.count == header.data_offset, "The data block should be at the end of the descriptor block."); > + printf("VM Descriptor block is overlapped with data block!\n"); @@ -236,10 +236,10 @@ cast to (struct kvm_stats_desc *) Tighter check: TEST_ASSERT(header.name_size > 0 && - strlen(pdesc->name) + 1 = header.name_size); + strlen(pdesc->name) + 1 == header.name_size); > + /* Check size field, which should not be zero */ -> + if (pdesc->size = 0) { +> + if (pdesc->size == 0) { > + printf("KVM descriptor(%s) with size of 0!\n", > + pdesc->name); > + goto out_free_desc; @@ -264,7 +264,7 @@ overlap check). Tighter check: -TEST_ASSERT(size_data = header.count * stats_data->value[0]); +TEST_ASSERT(size_data == header.count * stats_data->value[0]); > + > + /* Allocate memory for stats data */ @@ -319,12 +319,12 @@ TEST_ASSERT(size_data = header.count * stats_data->value[0]); > + goto out_close_fd; > + } > + /* Sanity check for other fields in header */ -> + if (header.count = 0) { +> + if (header.count == 0) { > + err = 0; > + goto out_close_fd; > + } > + /* Check overlap */ -> + if (header.desc_offset = 0 || header.data_offset = 0 || +> + if (header.desc_offset == 0 || header.data_offset == 0 || > + header.desc_offset < sizeof(header) || > + header.data_offset < sizeof(header)) { > + printf("Invalid offset fields in header!\n"); @@ -399,7 +399,7 @@ Same as above (tighter check). > + goto out_free_desc; > + } > + /* Check size field, which should not be zero */ -> + if (pdesc->size = 0) { +> + if (pdesc->size == 0) { > + printf("KVM descriptor(%s) with size of 0!\n", > + pdesc->name); > + goto out_free_desc; diff --git a/a/content_digest b/N2/content_digest index fae79c7..bf27546 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\020210517145314.157626-5-jingzhangos@google.com\0" "From\0Ricardo Koller <ricarkol@google.com>\0" "Subject\0Re: [PATCH v5 4/4] KVM: selftests: Add selftest for KVM statistics data binary interface\0" - "Date\0Wed, 19 May 2021 22:00:13 +0000\0" + "Date\0Wed, 19 May 2021 15:00:13 -0700\0" "To\0Jing Zhang <jingzhangos@google.com>\0" "Cc\0KVM <kvm@vger.kernel.org>" KVMARM <kvmarm@lists.cs.columbia.edu> @@ -159,7 +159,7 @@ "> +\t\tgoto out_close_fd;\n" "> +\t}\n" "> +\t/* Sanity check for other fields in header */\n" - "> +\tif (header.count = 0) {\n" + "> +\tif (header.count == 0) {\n" "> +\t\terr = 0;\n" "> +\t\tgoto out_close_fd;\n" "> +\t}\n" @@ -168,7 +168,7 @@ "TEST_ASSERT's. Most other selftests rely on TEST_ASSERT.\n" "\n" "> +\t/* Check overlap */\n" - "> +\tif (header.desc_offset = 0 || header.data_offset = 0 ||\n" + "> +\tif (header.desc_offset == 0 || header.data_offset == 0 ||\n" "> +\t\t\theader.desc_offset < sizeof(header) ||\n" "> +\t\t\theader.data_offset < sizeof(header)) {\n" "> +\t\tprintf(\"Invalid offset fields in header!\\n\");\n" @@ -180,7 +180,7 @@ "\n" "Could you make the check more strict?\n" "\n" - "TEST_ASSERT(header.desc_offset + size_desc * header.count = header.data_offset,\n" + "TEST_ASSERT(header.desc_offset + size_desc * header.count == header.data_offset,\n" "\t\"The data block should be at the end of the descriptor block.\");\n" "\n" "> +\t\tprintf(\"VM Descriptor block is overlapped with data block!\\n\");\n" @@ -272,10 +272,10 @@ "Tighter check:\n" "\n" "TEST_ASSERT(header.name_size > 0 &&\n" - "\tstrlen(pdesc->name) + 1 = header.name_size);\n" + "\tstrlen(pdesc->name) + 1 == header.name_size);\n" "\n" "> +\t\t/* Check size field, which should not be zero */\n" - "> +\t\tif (pdesc->size = 0) {\n" + "> +\t\tif (pdesc->size == 0) {\n" "> +\t\t\tprintf(\"KVM descriptor(%s) with size of 0!\\n\",\n" "> +\t\t\t\t\tpdesc->name);\n" "> +\t\t\tgoto out_free_desc;\n" @@ -300,7 +300,7 @@ "\n" "Tighter check:\n" "\n" - "TEST_ASSERT(size_data = header.count * stats_data->value[0]);\n" + "TEST_ASSERT(size_data == header.count * stats_data->value[0]);\n" "\n" "> +\n" "> +\t/* Allocate memory for stats data */\n" @@ -355,12 +355,12 @@ "> +\t\tgoto out_close_fd;\n" "> +\t}\n" "> +\t/* Sanity check for other fields in header */\n" - "> +\tif (header.count = 0) {\n" + "> +\tif (header.count == 0) {\n" "> +\t\terr = 0;\n" "> +\t\tgoto out_close_fd;\n" "> +\t}\n" "> +\t/* Check overlap */\n" - "> +\tif (header.desc_offset = 0 || header.data_offset = 0 ||\n" + "> +\tif (header.desc_offset == 0 || header.data_offset == 0 ||\n" "> +\t\t\theader.desc_offset < sizeof(header) ||\n" "> +\t\t\theader.data_offset < sizeof(header)) {\n" "> +\t\tprintf(\"Invalid offset fields in header!\\n\");\n" @@ -435,7 +435,7 @@ "> +\t\t\tgoto out_free_desc;\n" "> +\t\t}\n" "> +\t\t/* Check size field, which should not be zero */\n" - "> +\t\tif (pdesc->size = 0) {\n" + "> +\t\tif (pdesc->size == 0) {\n" "> +\t\t\tprintf(\"KVM descriptor(%s) with size of 0!\\n\",\n" "> +\t\t\t\t\tpdesc->name);\n" "> +\t\t\tgoto out_free_desc;\n" @@ -566,4 +566,4 @@ "> kvmarm@lists.cs.columbia.edu\n" > https://lists.cs.columbia.edu/mailman/listinfo/kvmarm -efa5700041d0b5f3356dd827500f44fd2b3787c1bebbcee88ac014ce96def72c +cc410cf9d26701c9fc42e7049d876c100cd07d648308cc30efdc524ef74ab792
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.