From: "Kinney, Michael D" <michael.d.kinney@intel.com>
To: edk2-devel@lists.01.org
Cc: Sean Brogan <sean.brogan@microsoft.com>,
Jiewen Yao <jiewen.yao@intel.com>,
Yonghong Zhu <yonghong.zhu@intel.com>,
Liming Gao <liming.gao@intel.com>,
Michael D Kinney <michael.d.kinney@intel.com>
Subject: [staging/FmpDevicePkg-master 1/8] BaseTools/Capsule: Add max value checks to Capsule Generation tools
Date: Sun, 29 Jul 2018 11:07:36 -0700 [thread overview]
Message-ID: <20180729180743.1648-2-michael.d.kinney@intel.com> (raw)
In-Reply-To: <20180729180743.1648-1-michael.d.kinney@intel.com>
https://bugzilla.tianocore.org/show_bug.cgi?id=1021
https://bugzilla.tianocore.org/show_bug.cgi?id=1022
https://bugzilla.tianocore.org/show_bug.cgi?id=1026
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
BaseTools/Source/Python/Capsule/GenerateCapsule.py | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/BaseTools/Source/Python/Capsule/GenerateCapsule.py b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
index 4018dc0420..5398c12a9c 100644
--- a/BaseTools/Source/Python/Capsule/GenerateCapsule.py
+++ b/BaseTools/Source/Python/Capsule/GenerateCapsule.py
@@ -298,6 +298,12 @@ if __name__ == '__main__':
parser.error ('--capflag PopulateSystemTable also requires --capflag PersistAcrossReset')
if 'InitiateReset' in args.CapsuleFlag:
parser.error ('--capflag InitiateReset also requires --capflag PersistAcrossReset')
+ if args.CapsuleOemFlag > 0xFFFF:
+ parser.error ('--capoemflag must be an integer between 0x0000 and 0xffff')
+ if args.HardwareInstance > 0xFFFFFFFFFFFFFFFF:
+ parser.error ('--hardware-instance must be an integer in range 0x0..0xffffffffffffffff')
+ if args.MonotonicCount > 0xFFFFFFFFFFFFFFFF:
+ parser.error ('--monotonic-count must be an integer in range 0x0..0xffffffffffffffff')
UseSignTool = args.SignToolPfxFile is not None
UseOpenSsl = (args.OpenSslSignerPrivateCertFile is not None and
@@ -319,6 +325,10 @@ if __name__ == '__main__':
if args.Encode and (UseSignTool or UseOpenSsl):
if args.FwVersion is None or args.LowestSupportedVersion is None:
parser.error ('the following options are required: --fw-version, --lsv')
+ if args.FwVersion > 0xFFFFFFFF:
+ parser.error ('--fw-version must be an integer in range 0x0..0xffffffff')
+ if args.LowestSupportedVersion > 0xFFFFFFFF:
+ parser.error ('--lsv must be an integer in range 0x0..0xffffffff')
if UseSignTool:
args.SignToolPfxFile.close()
--
2.14.2.windows.3
next prev parent reply other threads:[~2018-07-29 18:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-29 18:07 [staging/FmpDevicePkg-master 0/8] Fix GenerateCapsule issues Kinney, Michael D
2018-07-29 18:07 ` Kinney, Michael D [this message]
2018-07-29 18:07 ` [staging/FmpDevicePkg-master 2/8] BaseTools/Capsule: Remove support for PopulateSystemTable Kinney, Michael D
2018-07-29 18:07 ` [staging/FmpDevicePkg-master 3/8] BaseTools/Capsule: Fix CertType GUID byte order Kinney, Michael D
2018-07-29 18:07 ` [staging/FmpDevicePkg-master 4/8] BaseTools/Capsule: Do not support -o with --dump-info Kinney, Michael D
2018-07-29 18:07 ` [staging/FmpDevicePkg-master 5/8] BaseTools/Capsule: Update help for --fw-version and --lsv Kinney, Michael D
2018-07-29 18:07 ` [staging/FmpDevicePkg-master 6/8] BaseTools/Capsule: Update file header with tool limitations Kinney, Michael D
2018-07-29 18:07 ` [staging/FmpDevicePkg-master 7/8] BaseTools/Capsule: Prevent traceback during signing operations Kinney, Michael D
2018-07-29 18:07 ` [staging/FmpDevicePkg-master 8/8] BaseTools/Capsule: Support capsules without a payload header Kinney, Michael D
2018-07-30 4:53 ` [staging/FmpDevicePkg-master 0/8] Fix GenerateCapsule issues Zhu, Yonghong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180729180743.1648-2-michael.d.kinney@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox