From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D6ED9C433FE for ; Fri, 21 Oct 2022 15:03:56 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5055084EDA; Fri, 21 Oct 2022 17:03:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="Fk5S924U"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 13DA684FBE; Fri, 21 Oct 2022 17:03:52 +0200 (CEST) Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) (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 E6D6884D5E for ; Fri, 21 Oct 2022 17:03:48 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ilias.apalodimas@linaro.org Received: by mail-ed1-x530.google.com with SMTP id e18so6949230edj.3 for ; Fri, 21 Oct 2022 08:03:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=q7hg+vp8zo1MYOtTbHuAeQGSXB8ouZdcQFn5Pfjw33Y=; b=Fk5S924U7JT+FcCmxx2GuLj5roR8UnR8eR8NL/ZAXLYSTA0/ClvnUpMbXeSGdFKElA cPszKy/aOTDt9/zchq2Nag6P3ffhwh3WZY90JOFUOz//VFQWXlZ3Yj97KHwiz1/mFdqx rmfclUCD+LMB4zBKesV06jG6PsTFZChVLlWYkWlS0hSp3mFEBWT87TbMCJZArNQLSTij BYxcthcbmdxXNcXJYg/JzsBiBxniSzsX17L9Rjyn+IxDvjJajyT4ycYKOrn1oDNeq82d zXfMJy0FQb8YCXnjRZ72JRvYvoCgmMwc8bvJJJB0WCERNcwF2S/IZO+E1Qqco4uvsiAv GNlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=q7hg+vp8zo1MYOtTbHuAeQGSXB8ouZdcQFn5Pfjw33Y=; b=jOucbrStdbf0JDVMqWVtyGVKH9zq4I05N9jAmLXDjeVkwr8ryQ7YkuSnXEAkERrfT+ 7LbC7I/2lt+P6d4ocX67REoXDTh/rEw7hgKhcfb1uzjAT3Kdvn+KVbrN/4jhgUCRH56w DJtXl7o2WfRNka20tsIedaFRxcJm71QXkoXH27rNMWd0bepnKkQfetXkWdVU9lGhaFkf VIxb91gUcrN17bPuJ4BFs6U3ASK6+QhFXm7nfriqPPTtP230fy4Lv8UGZpLSoK4MP7WN 6uveOgNdYwgLvVbCOg2E2FGqDF2nFui6vpem2k04wRk+gwzrCRuh7A5VNpx1jw2KNGxe joYQ== X-Gm-Message-State: ACrzQf1Yqh281aSDTNcett95ck4Q+XZiUDzkUDkncAX+uxUFioz3WRg8 xGIwP3yzJplXjhjS2v88yoBlrQ== X-Google-Smtp-Source: AMsMyM6Xja5maB+4dnKxKf6YzwgKxoE9pI0ak+FcB58xCXH7Vwaen0I1ci75NGxbV+tgCVkL206vuA== X-Received: by 2002:a17:907:628f:b0:72f:58fc:3815 with SMTP id nd15-20020a170907628f00b0072f58fc3815mr16095085ejc.719.1666364628193; Fri, 21 Oct 2022 08:03:48 -0700 (PDT) Received: from hera (ppp046103015185.access.hol.gr. [46.103.15.185]) by smtp.gmail.com with ESMTPSA id p6-20020a05640243c600b0045b4b67156fsm13737378edc.45.2022.10.21.08.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Oct 2022 08:03:47 -0700 (PDT) Date: Fri, 21 Oct 2022 18:03:44 +0300 From: Ilias Apalodimas To: Sughosh Ganu Cc: u-boot@lists.denx.de, Heinrich Schuchardt , Takahiro Akashi , Patrick Delaunay , Patrice Chotard , Simon Glass , Tom Rini , Etienne Carriere , Jassi Brar Subject: Re: [PATCH v15 03/15] FWU: Add FWU metadata access driver for GPT partitioned block devices Message-ID: References: <20221021124608.681387-1-sughosh.ganu@linaro.org> <20221021124608.681387-4-sughosh.ganu@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20221021124608.681387-4-sughosh.ganu@linaro.org> 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.6 at phobos.denx.de X-Virus-Status: Clean Hi Sughosh > +{ > + int ret; > + u32 len, blk_start, blkcnt; > + struct disk_partition info; > + > + ALLOC_CACHE_ALIGN_BUFFER_PAD(struct fwu_mdata, mdata_aligned, 1, > + desc->blksz); > + > + if (!mdata) > + return -ENOMEM; ENOMEM is usually for allocation failures this is an -EINVAL > + > + ret = gpt_get_mdata_disk_part(desc, &info, part_num); > + if (ret < 0) { > + printf("Unable to get the FWU metadata partition\n"); > + return -ENOENT; > + } > + > + len = sizeof(*mdata); > + blkcnt = BLOCK_CNT(len, desc); > + if (blkcnt > info.size) { > + log_debug("Block count exceeds FWU metadata partition size\n"); > + return -ERANGE; > + } > + > + blk_start = info.start; > + if (access == MDATA_READ) { > + if (blk_dread(desc, blk_start, blkcnt, mdata_aligned) != blkcnt) { > + log_debug("Error reading FWU metadata from the device\n"); > + return -EIO; > + } > + memcpy(mdata, mdata_aligned, sizeof(struct fwu_mdata)); > + } else { else if ? > + if (blk_dwrite(desc, blk_start, blkcnt, mdata) != blkcnt) { > + log_debug("Error writing FWU metadata to the device\n"); > + return -EIO; > + } > + } > + > + return 0; > +} > + > +static int fwu_gpt_update_mdata(struct udevice *dev, struct fwu_mdata *mdata) > +{ > + int ret; > + struct blk_desc *desc; > + uint mdata_parts[2]; > + struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev); > + > + desc = dev_get_uclass_plat(priv->blk_dev); dev_get_uclass_plat might return NULL, gpt_read_write_mdata() doesn't check against NULL and then it ends up calling gpt_get_mdata_disk_part() which then calls part_get_info(). I don't think anyone checks for the desc ptr And I think this is a problem overall in all the callbacks belowe that invoke dev_get_uclass_plat() > + > + ret = gpt_get_mdata_partitions(desc, mdata_parts); > + if (ret < 0) { > + log_debug("Error getting the FWU metadata partitions\n"); > + return -ENOENT; > + } > + > + /* First write the primary partition */ > + ret = gpt_read_write_mdata(desc, mdata, MDATA_WRITE, mdata_parts[0]); > + if (ret < 0) { > + log_debug("Updating primary FWU metadata partition failed\n"); > + return ret; > + } > + > + /* And now the replica */ > + ret = gpt_read_write_mdata(desc, mdata, MDATA_WRITE, mdata_parts[1]); > + if (ret < 0) { > + log_debug("Updating secondary FWU metadata partition failed\n"); > + return ret; > + } > + > + return 0; > +} > + > +static int gpt_get_mdata(struct blk_desc *desc, struct fwu_mdata *mdata) > +{ > + int ret; > + uint mdata_parts[2]; > + > + ret = gpt_get_mdata_partitions(desc, mdata_parts); > + > + if (ret < 0) { > + log_debug("Error getting the FWU metadata partitions\n"); > + return -ENOENT; > + } > + > + ret = gpt_read_write_mdata(desc, mdata, MDATA_READ, mdata_parts[0]); > + if (ret < 0) { > + log_debug("Failed to read the FWU metadata from the device\n"); > + return -EIO; > + } > + > + ret = fwu_verify_mdata(mdata, 1); > + if (!ret) > + return 0; > + > + /* > + * Verification of the primary FWU metadata copy failed. > + * Try to read the replica. > + */ > + memset(mdata, '\0', sizeof(struct fwu_mdata)); > + ret = gpt_read_write_mdata(desc, mdata, MDATA_READ, mdata_parts[1]); > + if (ret < 0) { > + log_debug("Failed to read the FWU metadata from the device\n"); > + return -EIO; > + } > + > + ret = fwu_verify_mdata(mdata, 0); > + if (!ret) > + return 0; > + > + /* Both the FWU metadata copies are corrupted. */ > + return -EIO; > +} > + > +static int fwu_gpt_get_mdata(struct udevice *dev, struct fwu_mdata *mdata) > +{ > + struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev); > + > + return gpt_get_mdata(dev_get_uclass_plat(priv->blk_dev), mdata); > +} > + > +static int fwu_gpt_get_mdata_partitions(struct udevice *dev, uint *mdata_parts) > +{ > + struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev); > + > + return gpt_get_mdata_partitions(dev_get_uclass_plat(priv->blk_dev), > + mdata_parts); > +} > + > +static int fwu_gpt_read_mdata_partition(struct udevice *dev, > + struct fwu_mdata *mdata, uint part_num) > +{ > + struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev); > + > + return gpt_read_write_mdata(dev_get_uclass_plat(priv->blk_dev), > + mdata, MDATA_READ, part_num); > +} > + > +static int fwu_gpt_write_mdata_partition(struct udevice *dev, > + struct fwu_mdata *mdata, uint part_num) > +{ > + struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev); > + > + return gpt_read_write_mdata(dev_get_uclass_plat(priv->blk_dev), > + mdata, MDATA_WRITE, part_num); > +} > + > +static int fwu_get_mdata_device(struct udevice *dev, struct udevice **mdata_dev) > +{ > + u32 phandle; > + int ret, size; > + struct udevice *parent; > + const fdt32_t *phandle_p = NULL; > + > + phandle_p = dev_read_prop(dev, "fwu-mdata-store", &size); > + if (!phandle_p) { > + log_debug("fwu-mdata-store property not found\n"); > + return -ENOENT; > + } > + > + phandle = fdt32_to_cpu(*phandle_p); > + > + ret = device_get_global_by_ofnode(ofnode_get_by_phandle(phandle), > + &parent); > + if (ret) > + return ret; > + > + return blk_get_from_parent(parent, mdata_dev); > +} > + > +static int fwu_mdata_gpt_blk_probe(struct udevice *dev) > +{ > + int ret; > + struct udevice *mdata_dev = NULL; > + struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev); > + > + ret = fwu_get_mdata_device(dev, &mdata_dev); > + if (ret) > + return ret; > + > + priv->blk_dev = mdata_dev; > + > + return 0; > +} > + > +static const struct fwu_mdata_ops fwu_gpt_blk_ops = { > + .get_mdata = fwu_gpt_get_mdata, > + .update_mdata = fwu_gpt_update_mdata, > + .get_mdata_part_num = fwu_gpt_get_mdata_partitions, > + .read_mdata_partition = fwu_gpt_read_mdata_partition, > + .write_mdata_partition = fwu_gpt_write_mdata_partition, > +}; > + > +static const struct udevice_id fwu_mdata_ids[] = { > + { .compatible = "u-boot,fwu-mdata-gpt" }, > + { } > +}; > + > +U_BOOT_DRIVER(fwu_mdata_gpt_blk) = { > + .name = "fwu-mdata-gpt-blk", > + .id = UCLASS_FWU_MDATA, > + .of_match = fwu_mdata_ids, > + .ops = &fwu_gpt_blk_ops, > + .probe = fwu_mdata_gpt_blk_probe, > + .priv_auto = sizeof(struct fwu_mdata_gpt_blk_priv), > +}; > diff --git a/include/fwu.h b/include/fwu.h > index a83ea19534..ce99c02618 100644 > --- a/include/fwu.h > +++ b/include/fwu.h > @@ -14,6 +14,10 @@ > struct fwu_mdata; > struct udevice; > > +struct fwu_mdata_gpt_blk_priv { > + struct udevice *blk_dev; > +}; > + > /** > * @mdata_check: check the validity of the FWU metadata partitions > * @get_mdata() - Get a FWU metadata copy > -- > 2.34.1 > Regards /Ilias