From patchwork Sat Oct 28 22:57:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1856624 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=LWEI1f4O; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SHw0q27Rbz1yQ4 for ; Sun, 29 Oct 2023 09:57:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5A95287794; Sun, 29 Oct 2023 00:57:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="LWEI1f4O"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 31BFE8779C; Sun, 29 Oct 2023 00:57:34 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 45B698775C for ; Sun, 29 Oct 2023 00:57:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qk1-x730.google.com with SMTP id af79cd13be357-778999c5ecfso243912885a.2 for ; Sat, 28 Oct 2023 15:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698533850; x=1699138650; darn=lists.denx.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RbuDGf+ket1MmVPUMTmZx1+oCEOX4DTW0O5XtlWc+nc=; b=LWEI1f4O6hQbVx3sEdix0sRPZU+zpTKp1+tdwS/+JJ/mwns9si/70lXwUETFvtwQmh +WecihzewANI0rl1VrzL+j+D4JW10SVq8PRibl+MKJxcaCfHrPk6AoHUT7jQ/VfIsTT9 a7KOCO817r+PbvLEXazRaHsmI2OMJ8pDSieXxqUMXmBGYl/zqR+xiDdmfRTpjrVLJvsS lMgqSBG9c1ZNEUU0vUenNgYcmHspQ41T3Q7zf7f+1mT/ULuYC6YkZGwYxJ7JYBbJ8Avh RoW2rZBUBvlc9FWtnq0MgE/GhG8fzqNC104j6n5QBteoMoTsiJfp4+6E9jeFTxAqzYKu J7lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698533850; x=1699138650; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=RbuDGf+ket1MmVPUMTmZx1+oCEOX4DTW0O5XtlWc+nc=; b=adZJLJfS6fh3jitvsBPBjxPYhLTVtzQrVNYMEHwOgcypH9E35q0gefIV9w9B+zMHUe 1FC2LbFmrswhIcmWwLoiq+gOohU3YXjxHSPoQuo8C19E+LnvK/mcHwrTTZzfXfw+eUjW JhYL7XzFShRO+gEFxI1+EJUGrHkXT8ZYYKButwBZSa3GzucgZMxSVOBW/80GzcISDTvk GCn45V8lhXTb0JbWgOH/DW8T6QbN+nJ/A4Dl60K3z6lo34PhhHpfe1ZWxshVlyQU5F0f IzvZGc59Ml3EwXe2I4rw9YbxNkz5e6bfRcOGmoedQWYB5c6ucqYoHbCZCQ749OGczriU RYQQ== X-Gm-Message-State: AOJu0YyWm+oqhmJ3DSa+QJd/HQESVacOn4h38XNjM9gPN0cwFy98tFLU 011S1MzYbQk5YGrJyY5mCQA= X-Google-Smtp-Source: AGHT+IEFqcAMo4EONw4koUFr/Bt2lVQ4qi5gpBSJthr/4Vf9HfT74aH0fuIqYomRyzrxZ6m8XsyArw== X-Received: by 2002:a05:620a:27ca:b0:770:9e5b:e1e7 with SMTP id i10-20020a05620a27ca00b007709e5be1e7mr5756014qkp.62.1698533849817; Sat, 28 Oct 2023 15:57:29 -0700 (PDT) Received: from localhost (pool-108-48-157-169.washdc.fios.verizon.net. [108.48.157.169]) by smtp.gmail.com with UTF8SMTPSA id r29-20020a05620a03dd00b00767da9b6ae9sm1923825qkm.11.2023.10.28.15.57.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 28 Oct 2023 15:57:29 -0700 (PDT) From: Sean Anderson To: Ramon Fried , Joe Hershberger , u-boot@lists.denx.de Cc: Bin Meng , Simon Glass , Sean Anderson Subject: [PATCH] test: eth: Don't crash if env_get returns NULL Date: Sat, 28 Oct 2023 18:57:27 -0400 Message-Id: <20231028225727.1046361-1-seanga2@gmail.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean env_get can return NULL if it fails to find the variable. Check its result before using it. Fixes: 6d9764c2a87 ("dm: test: Add a new test case against dm eth codes for NULL pointer access") Fixes: df33fd28897 ("test: eth: Add test for ethernet addresses") Signed-off-by: Sean Anderson --- test/dm/eth.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/test/dm/eth.c b/test/dm/eth.c index d05d2a9abe1..bb3dcc6b954 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -263,12 +263,16 @@ static int dm_test_eth_act(struct unit_test_state *uts) /* Prepare the test scenario */ for (i = 0; i < DM_TEST_ETH_NUM; i++) { + char *addr; + ut_assertok(uclass_find_device_by_name(UCLASS_ETH, ethname[i], &dev[i])); ut_assertok(device_remove(dev[i], DM_REMOVE_NORMAL)); /* Invalidate MAC address */ - strncpy(ethaddr[i], env_get(addrname[i]), 17); + addr = env_get(addrname[i]); + ut_assertnonnull(addr); + strncpy(ethaddr[i], addr, 17); /* Must disable access protection for ethaddr before clearing */ env_set(".flags", addrname[i]); env_set(addrname[i], NULL); @@ -312,12 +316,16 @@ static int dm_test_ethaddr(struct unit_test_state *uts) for (i = 0; i < ARRAY_SIZE(addr); i++) { char addrname[10]; + char *env_addr; if (i) snprintf(addrname, sizeof(addrname), "eth%daddr", i + 1); else strcpy(addrname, "ethaddr"); - ut_asserteq_str(addr[i], env_get(addrname)); + + env_addr = env_get(addrname); + ut_assertnonnull(env_addr); + ut_asserteq_str(addr[i], env_addr); } return 0;