From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by mx.groups.io with SMTP id smtpd.web12.3601.1582349120102869867 for ; Fri, 21 Feb 2020 21:25:20 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=nmkjQriT; spf=pass (domain: gmail.com, ip: 209.85.214.196, mailfrom: newexplorerj@gmail.com) Received: by mail-pl1-f196.google.com with SMTP id t14so1758882plr.8 for ; Fri, 21 Feb 2020 21:25:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=bYAkM3FUOjlUFUeLxmp4T0oAgEGya/A20BlR/ty7Np4=; b=nmkjQriTSeyVdZvgcdChKpj8n5mS7PRAaMFQzh5YODFfui/3eaYKorjBEfO54SL0HR h3Jk1tm6AdZCJQygx1tWNSnGGukdc5JYqsCB4zFqFmkkwxXPFjd6f7jdd2k45Y/bL/tG f5pgCHzshr+JZYuvGj0h7qACBJAOQKFpHXStIAFuCwg0b50NjUyKo9Qo+JW+0NG0zh7Q XLJrijHYn2XTZrgvhI+dKcUJIbDY/mn6l7q0fip1elh3XwgV4iQZ5LXtzm8vnpqlBOad 2Dx605O7Oe+oCmFKLrRjJTMwBhRUyhKzdzR1uKYJYW5feljRBv7Dev5O5AAGXQhI42OM U7qg== 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=bYAkM3FUOjlUFUeLxmp4T0oAgEGya/A20BlR/ty7Np4=; b=ZvtHphhp4xdiE2tuUDQbMjdUzu12K+ituW/Qohs1v3HyPMPSGDC3G6vUvWJiEFBwF6 LgIohtahu3sK3xsWl2mphpN6sxm24bA+EmQlIIu3CJ7SFnU7w2FcpfZI3pvP+UwBV/yc a+H3+cUxqO+x89GoYhzNI2YIdJcaRDptQmgY8PDJELyTIP/StlCxo8pZ1obhQjcYJ+41 e2b2rB1V9r1V+JFtQb6h179vErO+gEBnxy6fJnAgpvlJW/YfUK+4F6ViYew+P40QR4zr /+KI+PTp/BapOF2o5Ki8/dQ03t4pYY4hYIFVgarMTHWlznRYaFLoOk0C036gvUITgxut lYcg== X-Gm-Message-State: APjAAAUDvJTCZMtN/iDKrsE5WqFyGBNZoeS8rA6Bex3CHvm5tmdt11D5 iTsv+QdHR+StWmd/9NeMdwb+11QLumOyFQ== X-Google-Smtp-Source: APXvYqyORD9BHhUGtifbGfryNvpD5tjBVBu+Ip1vrLTvH1UVQaW+fw2FD+BkalXZhmIQV3hdMqNouw== X-Received: by 2002:a17:90a:804a:: with SMTP id e10mr7312785pjw.41.1582349119184; Fri, 21 Feb 2020 21:25:19 -0800 (PST) Return-Path: Received: from localhost.localdomain ([223.104.146.86]) by smtp.gmail.com with ESMTPSA id 11sm4615581pfz.25.2020.02.21.21.25.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2020 21:25:18 -0800 (PST) From: "GuoMinJ" To: devel@edk2.groups.io Cc: GuoMinJ Subject: [PATCH] MdeModulePkg/SdDxe: Potential NULL pointer on Token Date: Sat, 22 Feb 2020 13:25:07 +0800 Message-Id: <04882a15a058465196f26220e820e99d90f98473.1582349099.git.newexplorerj@gmail.com> X-Mailer: git-send-email 2.17.1 REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2286 Token pointer may be NULL, it is should be check before use it. Signed-off-by: GuoMinJ --- MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c index 9f42abe7e2..25ab5abb2d 100644 --- a/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c +++ b/MdeModulePkg/Bus/Sd/SdDxe/SdBlockIo.c @@ -1367,7 +1367,12 @@ SdEraseBlocks ( return Status; } - DEBUG ((EFI_D_ERROR, "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x Event %p with %r\n", Lba, BlockNum, Token->Event, Status)); + DEBUG ((DEBUG_ERROR, "SdEraseBlocks(): Lba 0x%x BlkNo 0x%x with %r, ", Lba, BlockNum, Status)); + if ((Token != NULL) && (Token->Event != NULL)) { + DEBUG ((DEBUG_ERROR, "Event pointer is %p\n", Token->Event)); + else { + DEBUG ((DEBUG_ERROR, "Event is meaningless\n")); + } return Status; } -- 2.17.1