From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web09.9984.1583322564217515268 for ; Wed, 04 Mar 2020 03:49:24 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=d3Th7+Pb; spf=pass (domain: linaro.org, ip: 209.85.221.68, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f68.google.com with SMTP id j7so1992128wrp.13 for ; Wed, 04 Mar 2020 03:49:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=t0FL5lHZF3fWEVsDeuMSIa+hUCbK6vENi05DP8gMy/I=; b=d3Th7+Pbkw2Q69mFsVVwDaD4eiVKg3lIne7V5tie3z2JBVcvoV1HZo0b0s72aJo6hV uQ5BaPmyVSRY6qO4wga+p3aGoXGx8gZBNSeg85vBmIT26tO4S6MazxTTwItTL4hNf3JY tNULPgeKSkoiOyw/a01eVbR5FR/2k76qo06eQiILFSRkTWBsZZDTE9NNd3Utj+ax65tM LnXy6ioAOQ6dOfE1q8V90ejtid/b7HFA8x7nCz0FqPCL+3HQa1Xl6SBjGLThizycZCCh 1u/GYOzF/yLxEyWAw4vn1pVbF6463FfbJEKfoNJYSLKqO+agukVWK1/PPEI/rdPKZXQs M/iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=t0FL5lHZF3fWEVsDeuMSIa+hUCbK6vENi05DP8gMy/I=; b=OnOduVN02OB9jzPjzDD9RnC27NuujNPdfhWn0Uh3OWHEZMn2SF1nZ9xhFflstDHK0h yy3G3BrsKTucPc3rU2rbKbtLirpNO38FC2X5HS6rd++IrLIE+m6aB2x+0PSA18u0O02h e5J/EhLREzwqrAI2ajA5/YxlM2G0E6UCzQz+E3TQXq86bju1/+m5yXseLylfjzLskcyr bE74Utqo3ahrhyTZQvY+C/HgzcrWVpmUYZzXt5Ofi9QolL/A1kKHde4NkeD/ptq5Gwc4 p7UFU5+LqoqPkrt7rcTDNLHmDarCsrS2guW0DEwCPZvJpxwpI1p4VjLgBsv8ek1RZHlU Xqow== X-Gm-Message-State: ANhLgQ0Et8mDkNWfU+CwuHvvo6i/0+kTvGAcyuyhITZZ6NbyqrSozm9F P/VTNO1lWYA6H000pn6P7uKsNvSO6PCSPg== X-Google-Smtp-Source: ADFU+vthoCHDpcDLwe4XrK7jFbeZspyMCMN2MGwAQ++4E7HX5YlzH9eLVSkRpJcGiql4yC6SCctbsQ== X-Received: by 2002:a5d:4ac8:: with SMTP id y8mr3729692wrs.272.1583322562550; Wed, 04 Mar 2020 03:49:22 -0800 (PST) Return-Path: Received: from e123331-lin.home ([2a01:cb1d:112:6f00:816e:ff0d:fb69:f613]) by smtp.gmail.com with ESMTPSA id i18sm35564044wrv.30.2020.03.04.03.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 03:49:21 -0800 (PST) From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: lersek@redhat.com, Ard Biesheuvel Subject: [PATCH 1/1] OvmfPkg/LinuxInitrdDynamicShellCommand: fix uninitialized status return Date: Wed, 4 Mar 2020 12:49:19 +0100 Message-Id: <20200304114919.8746-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 The Linaro CI reports: OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c:132:7: error: variable 'Status' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] if (mInitrdLoadFile2Handle != NULL) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c:141:10: note: uninitialized use occurs here return Status; ^~~~~~ OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c:132:3: note: remove the 'if' if its condition is always true if (mInitrdLoadFile2Handle != NULL) { ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c:130:23: note: initialize the variable 'Status' to silence this warning EFI_STATUS Status; ^ = 0 Fix this by pulling the return of Status into the conditional block where it is assigned, and return EFI_SUCCESS otherwise. Signed-off-by: Ard Biesheuvel --- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c index ed8fbaa77069..021b072826a9 100644 --- a/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c +++ b/OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.c @@ -137,8 +137,9 @@ UninstallLoadFile2Protocol ( if (!EFI_ERROR (Status)) { mInitrdLoadFile2Handle = NULL; } + return Status; } - return Status; + return EFI_SUCCESS; } STATIC -- 2.17.1