From 7671db226ab775df3ceb00dcbfe4e42b7a5929e3 Mon Sep 17 00:00:00 2001
From: Ian Benz <ianbenz@google.com>
Date: Tue, 8 Nov 2022 13:48:18 -0800
Subject: [PATCH] Prevent oemcrypto_opk_deactivate_usage_entry_fuzz abort

Merge from Widevine repo of http://go/wvgerrit/158203

Prevent abort, interpreted as a crash by libFuzzer, when
OEMCrypto_CreateUsageTableHeader fails session state checks due to being
called after OEMCrypto_GenerateNonce.

Bug: 251215411
Test: tested with http://go/ag/20420224

Change-Id: I71ad1186ff2cb9ced81f9950d2fa235878aeb54d
---
 .../test/fuzz_tests/oemcrypto_deactivate_usage_entry_fuzz.cc    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_deactivate_usage_entry_fuzz.cc b/libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_deactivate_usage_entry_fuzz.cc
index 560a172d..65b043e7 100644
--- a/libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_deactivate_usage_entry_fuzz.cc
+++ b/libwvdrmengine/oemcrypto/test/fuzz_tests/oemcrypto_deactivate_usage_entry_fuzz.cc
@@ -16,8 +16,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   Session* session = entry.license_messages().session();
   session->open();
   entry.InstallTestRSAKey(session);
-  session->GenerateNonce();
   session->CreateNewUsageEntry();
+  session->GenerateNonce();
   vector<uint8_t> encrypted_usage_header;
   session->UpdateUsageEntry(&encrypted_usage_header);
   // LoadLicense sets the pst for usage entry.