From 239af8b9fc800f04bde455479c003dcecebee409 Mon Sep 17 00:00:00 2001 From: Craig Tiller <ctiller@google.com> Date: Wed, 1 Feb 2017 10:21:42 -0800 Subject: [PATCH] Fix fuzzing detected crash --- src/core/lib/surface/call.c | 10 +- .../0a4b84c2a50ba66f06c99e945912972cdcfc96be | Bin 0 -> 301 bytes .../22c7bfb3460529c77255e9cb82ef8f7d8381f8f3 | Bin 0 -> 84 bytes .../33f0e1b78dd158df720604cbb4c9a0c90eece435 | Bin 0 -> 84 bytes .../3cac506501825fadf2e4adf7619d16f72cfd8832 | Bin 0 -> 322 bytes .../87a34188d51bc8b43bd7d9097958097e70154960 | Bin 0 -> 85 bytes .../939a61533db8868591c514fc41c7dfb4232e3e4f | Bin 0 -> 86 bytes .../98a661d328f1ad6277c802604126d91965d6fda8 | Bin 0 -> 85 bytes .../9c052499ada417d5038f8cc7da62e6acae9ba9ae | Bin 0 -> 144 bytes .../a881a2dcd16f595644c1543ccf047b7ae5bb7fa4 | Bin 0 -> 275 bytes .../b09e64aa807db006a219bd1b9faf1a2e00dc6d33 | Bin 0 -> 128 bytes ...h-b208a1eb5ef9f229f309492329323f485768fa74 | Bin 0 -> 82 bytes .../e52ac2e3cad2e544488a01822115cb37d10a76ce | Bin 0 -> 86 bytes tools/run_tests/generated/tests.json | 264 ++++++++++++++++++ 14 files changed, 271 insertions(+), 3 deletions(-) create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/0a4b84c2a50ba66f06c99e945912972cdcfc96be create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/22c7bfb3460529c77255e9cb82ef8f7d8381f8f3 create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/33f0e1b78dd158df720604cbb4c9a0c90eece435 create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/3cac506501825fadf2e4adf7619d16f72cfd8832 create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/87a34188d51bc8b43bd7d9097958097e70154960 create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/939a61533db8868591c514fc41c7dfb4232e3e4f create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/98a661d328f1ad6277c802604126d91965d6fda8 create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/9c052499ada417d5038f8cc7da62e6acae9ba9ae create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/a881a2dcd16f595644c1543ccf047b7ae5bb7fa4 create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/b09e64aa807db006a219bd1b9faf1a2e00dc6d33 create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/crash-b208a1eb5ef9f229f309492329323f485768fa74 create mode 100644 test/core/end2end/fuzzers/api_fuzzer_corpus/e52ac2e3cad2e544488a01822115cb37d10a76ce diff --git a/src/core/lib/surface/call.c b/src/core/lib/surface/call.c index 27097faaa6..f0135acde8 100644 --- a/src/core/lib/surface/call.c +++ b/src/core/lib/surface/call.c @@ -312,15 +312,19 @@ grpc_error *grpc_call_create(grpc_exec_ctx *exec_ctx, /* TODO(ctiller): This should change to use the appropriate census start_op * call. */ if (args->propagation_mask & GRPC_PROPAGATE_CENSUS_TRACING_CONTEXT) { - GPR_ASSERT(args->propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT); + if (0 == (args->propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT)) { + add_init_error(&error, + GRPC_ERROR_CREATE("Census tracing propagation requested " + "without Census context propagation")); + } grpc_call_context_set( call, GRPC_CONTEXT_TRACING, args->parent_call->context[GRPC_CONTEXT_TRACING].value, NULL); } else if (0 == (args->propagation_mask & GRPC_PROPAGATE_CENSUS_STATS_CONTEXT)) { add_init_error(&error, - GRPC_ERROR_CREATE("Census tracing propagation requested " - "without Census context propagation")); + GRPC_ERROR_CREATE("Census context propagation requested " + "without Census tracing propagation")); } if (args->propagation_mask & GRPC_PROPAGATE_CANCELLATION) { call->cancellation_is_inherited = 1; diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/0a4b84c2a50ba66f06c99e945912972cdcfc96be b/test/core/end2end/fuzzers/api_fuzzer_corpus/0a4b84c2a50ba66f06c99e945912972cdcfc96be new file mode 100644 index 0000000000000000000000000000000000000000..d0f43e9d91815c155e77dbe4f9770901a1e3328b GIT binary patch literal 301 zcmZvXK??y<5Xa}u)<d+lDQ9jtD87Ji;re<p*jjd*eMk;2E>1q8Qoe+PXEqX1Gd1&{ zncvJbPy>MK22mCRsu^eF-h}KbF?QwVDaURHB0dXwo|w6FSs#{mK_*=jb37r)d->gu z6XP0BnhGNOiJN}%w%<I#4PH3Zo3KM=9=!sI+FdX9xA3#v@{F93%if2fyap%l{k~qU r1x1G1s@t)UL5b6lThP=Yz?sT5QGya`WR#_#7<4gmMPIa6=x})e>EBh+ literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/22c7bfb3460529c77255e9cb82ef8f7d8381f8f3 b/test/core/end2end/fuzzers/api_fuzzer_corpus/22c7bfb3460529c77255e9cb82ef8f7d8381f8f3 new file mode 100644 index 0000000000000000000000000000000000000000..b5f6a8572ccb615fb0042b6471d10bc286e5d650 GIT binary patch literal 84 zcmZQ7PAw`+En;9`Vc=rWPs`5-^BL2N3X+S9<4Y2Y(o;*~^AgwQrpD(3)fHu?q%!pX h|Np;Un45=@fq{YX|9>FC!1$|^fdMGOoWsDb2>`LE8kPV6 literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/33f0e1b78dd158df720604cbb4c9a0c90eece435 b/test/core/end2end/fuzzers/api_fuzzer_corpus/33f0e1b78dd158df720604cbb4c9a0c90eece435 new file mode 100644 index 0000000000000000000000000000000000000000..df5e44292eafe54f067e1d4833637d3ae3c05d14 GIT binary patch literal 84 zcmZQ7PAw`+En;9`Vc=rWPs`5-^BL2N3X=7zi*w>j5{uGPOY#zPQ{(f2>WVT`iW&O< i|F0M3=3!)DaA5rZpMim~lZ~5!hl!PenE@!q%nks5T^IWR literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/3cac506501825fadf2e4adf7619d16f72cfd8832 b/test/core/end2end/fuzzers/api_fuzzer_corpus/3cac506501825fadf2e4adf7619d16f72cfd8832 new file mode 100644 index 0000000000000000000000000000000000000000..62447e4f081934a02607249e93ea0dc02a47f939 GIT binary patch literal 322 zcmZY5u};G<5C-706QvHVDiAwTg#=NA%ASRd7l5Ig<tEo)VdCnN1~D<f!o-tw=XrPu zBo<>6(GGa9bUOL|@621I9tj|Z1GrpSJJhVEb@DhBC^G7^yqveK`I5JaYV2gA9#C5U zigbkz-kp0s9#0tf!@l4A^|_4!QkcS#GTe_rA!wE5xo^EXw>7{y|I0nRneU_HU}1Fx zv<`ybSlRtgy@oRAf@;@>RHQuNGyK4-v+_<2$kWB_;v8NEYoHF+fFiqTDoJ*!8So^? qi}B>7Y0${FQ{_DtatVGbkur!zh1h8H8%87DYg73zV+1_zo_+wddtUhf literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/87a34188d51bc8b43bd7d9097958097e70154960 b/test/core/end2end/fuzzers/api_fuzzer_corpus/87a34188d51bc8b43bd7d9097958097e70154960 new file mode 100644 index 0000000000000000000000000000000000000000..a90fb52338d1d066acc87d7c8c5d8c3484f313f4 GIT binary patch literal 85 zcmZQ7PAw`+En;9`Vc=rWPs`5-^BL2N3X=7Ti*w>j5{uGPOXBkq*XE|i=L1z1Wu~Mu i^#A|=zh0P|hmnDSf${%;Ai==+tCN8ND8kIZpa}rTP#V1e literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/939a61533db8868591c514fc41c7dfb4232e3e4f b/test/core/end2end/fuzzers/api_fuzzer_corpus/939a61533db8868591c514fc41c7dfb4232e3e4f new file mode 100644 index 0000000000000000000000000000000000000000..c21081b54197906f1ad3f9fb3c123734af4bab88 GIT binary patch literal 86 zcmZQ7PAw`+En;9`Vc=rWPs`5-^BL2N3X=7Ti*w>j5{uGPOXBkq*XE|i=L1z1Wu~Mu j^#A|=zh0P|hmnDSf${%;Ai==+tCN8ND8kIZz^(}Z;_@2A literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/98a661d328f1ad6277c802604126d91965d6fda8 b/test/core/end2end/fuzzers/api_fuzzer_corpus/98a661d328f1ad6277c802604126d91965d6fda8 new file mode 100644 index 0000000000000000000000000000000000000000..ee68d203dc698ba527ee2aa6ae641f1acd384b35 GIT binary patch literal 85 zcmZQ7PAw`+En;9`Vc=rWPs`5-^BL2N3X=7Ti*w>j5{uGPOXBkq*XE|i=L1z1Wu~Mu j^#A|=zh0P|hmnDSf${%;Ai==+tCN9&n}?a1fk6`h$XXh| literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/9c052499ada417d5038f8cc7da62e6acae9ba9ae b/test/core/end2end/fuzzers/api_fuzzer_corpus/9c052499ada417d5038f8cc7da62e6acae9ba9ae new file mode 100644 index 0000000000000000000000000000000000000000..ccee196ca36ecae8c389c68e09174c88fdc4e59d GIT binary patch literal 144 zcmWe*vSwglVBElvUR02*mz!7-UzD1hpO=@KToRv@n4F!TmKL8|%pjP^&rra`mdU`( z#8%Fix`%_KC{07_KTv1OqyPWcvM{i+b24#oN--6u76Ij9(oBk}>Ijo_Q;Ule(^KPf gQuESFG8l>&7+4fjcPK|F>M(FI=%?l97c(>i0Lf@6r2qf` literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/a881a2dcd16f595644c1543ccf047b7ae5bb7fa4 b/test/core/end2end/fuzzers/api_fuzzer_corpus/a881a2dcd16f595644c1543ccf047b7ae5bb7fa4 new file mode 100644 index 0000000000000000000000000000000000000000..cd6c17b10bfb4d258a82ce291a260520362faeae GIT binary patch literal 275 zcmZvXK@P!C5QhJG<f#&oNNjBESaAeLX&OdJs%1(oZ6w0R-W{ymz)_mGgw69bT~uOL zGntw1n^6f%$^um3Vmy!Iyrw|b(@~Oy-gYAaZ@tK0u@~FH<&1GP=Fn+0322is0G%}m z4YylYN$(#{zPu9C|7GUTLRV_-tnN|x3gL9&M-hjB0yMqPKz>H0rZjB0d!9(DT7763 mc5Dg~=$B%VbO_4s7?2!KFb?Q>%r5!T-5zg$83Gm5oEtt*bx)H3 literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/b09e64aa807db006a219bd1b9faf1a2e00dc6d33 b/test/core/end2end/fuzzers/api_fuzzer_corpus/b09e64aa807db006a219bd1b9faf1a2e00dc6d33 new file mode 100644 index 0000000000000000000000000000000000000000..50548fa35d9a78b9ba6e4eaf223cd673c9754905 GIT binary patch literal 128 zcmZQ7PAw`+En;9`Vc=p&OV0;!({l35lS^_K%GEhiIW&sOG_;cSii>l;$1}0<X{K^? z6oqM&BnG9Ymc-{J=BCC2wHIZk{7?O_^}nCt|NnXh2F{j8%nXbS3=ABM48q(zKvn?* b<Bv`T2FA5446d9Ed<-QF49Nuy%+^)_B`YMs literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/crash-b208a1eb5ef9f229f309492329323f485768fa74 b/test/core/end2end/fuzzers/api_fuzzer_corpus/crash-b208a1eb5ef9f229f309492329323f485768fa74 new file mode 100644 index 0000000000000000000000000000000000000000..e7a6aedd9fedc8e3b54d06f2b775a6dd45de5f33 GIT binary patch literal 82 zcmZQ7PAw`+En;9`Vc=rWPs`5-^BL2N3X=7Ti*w=&3X9THOX~9yb5rB<feJHIQW^UH h|F0M3=3!)D5MccOpMim~lZ}Cqft!n!fq{XU9RN(R7smhq literal 0 HcmV?d00001 diff --git a/test/core/end2end/fuzzers/api_fuzzer_corpus/e52ac2e3cad2e544488a01822115cb37d10a76ce b/test/core/end2end/fuzzers/api_fuzzer_corpus/e52ac2e3cad2e544488a01822115cb37d10a76ce new file mode 100644 index 0000000000000000000000000000000000000000..b3bb2405d81aa4f78b3891e162217ec296c55b75 GIT binary patch literal 86 zcmZQ7PAw`+En;9`Vc=rWPs`5-^BL2N3X=7Ti*w>j5{uGPOXBkq*XE|i=L1z1Wu~Mu g^#A|=zh0P|hmnDSf${%;Ai==+tCN8NBEqf-0OI2s!2kdN literal 0 HcmV?d00001 diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index c28a68e910..310abb43f2 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -42323,6 +42323,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/0a4b84c2a50ba66f06c99e945912972cdcfc96be" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/0a71ae781345f9ee2b08008a81f9055e6c1d5256" @@ -46679,6 +46701,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/22c7bfb3460529c77255e9cb82ef8f7d8381f8f3" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/22c9ed2979d9963bce6500997f1e0433988e7e37" @@ -50067,6 +50111,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/33f0e1b78dd158df720604cbb4c9a0c90eece435" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/33ff864434b4f0c0e08c00ec2442cb521e9f79ed" @@ -51563,6 +51629,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/3cac506501825fadf2e4adf7619d16f72cfd8832" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/3cc56c99c6046f0d66c50c4062d90608064fd742" @@ -65643,6 +65731,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/87a34188d51bc8b43bd7d9097958097e70154960" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/87a4605e106399e71e689468a23ba11e7f17de2b" @@ -67887,6 +67997,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/939a61533db8868591c514fc41c7dfb4232e3e4f" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/940a622e8995529f6b0455906d8a035902682d2d" @@ -68745,6 +68877,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/98a661d328f1ad6277c802604126d91965d6fda8" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/98b88c0751f1d9e5dc3d4751d2cb52ed8f0b008d" @@ -69339,6 +69493,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/9c052499ada417d5038f8cc7da62e6acae9ba9ae" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/9c0911c1a4b91f842670082c14af67d1f4b7bb6f" @@ -71385,6 +71561,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/a881a2dcd16f595644c1543ccf047b7ae5bb7fa4" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/a89d59f59e43670ca3e8baf454fea723ae295653" @@ -72771,6 +72969,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/b09e64aa807db006a219bd1b9faf1a2e00dc6d33" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/b0c9bc430c79f064b61d8cad076b072c9c014804" @@ -80493,6 +80713,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/crash-b208a1eb5ef9f229f309492329323f485768fa74" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/crash-b39ce8e62e5c9e046d67e946436609e01f067a53" @@ -84981,6 +85223,28 @@ ], "uses_polling": false }, + { + "args": [ + "test/core/end2end/fuzzers/api_fuzzer_corpus/e52ac2e3cad2e544488a01822115cb37d10a76ce" + ], + "ci_platforms": [ + "linux" + ], + "cpu_cost": 0.1, + "exclude_configs": [ + "tsan" + ], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "language": "c", + "name": "api_fuzzer_one_entry", + "platforms": [ + "linux" + ], + "uses_polling": false + }, { "args": [ "test/core/end2end/fuzzers/api_fuzzer_corpus/e53a201505fe8412278d7444b1a915b353bacb3e" -- GitLab