Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2587464iob; Fri, 6 May 2022 06:19:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeFpyUSXd4txB+tr3aj7tgPnpIf9dvQksgypZoh78nYcIrk+tHnfr4uSQn+JQvO48kRemk X-Received: by 2002:a17:907:7da3:b0:6f5:2d00:e069 with SMTP id oz35-20020a1709077da300b006f52d00e069mr1497478ejc.743.1651843186712; Fri, 06 May 2022 06:19:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651843186; cv=none; d=google.com; s=arc-20160816; b=cOy7yPu/WmAZup5/ObIj3q9X8K9Bdgb+TfOhS6I9PtZAo0STZFXFJkopuC1GMs+bHn eJoU6Dcmt++uhl/JOCwnnlxlkxHLiTmheTmWCMfy7dFWDM0zzgL1DV+DDcm2raseG0QQ c+PxMDA9noNbkNviAICOGQz2VsugiQ28/hj2BH8CiXSygkgIMo8e71TOO73oycBttN9y j/VTMAVtc+XmGXSG+/qV3JPjfLFB/+SBIzh2GO6r/Us1M87kAnwuvpKuolK9z5UKxbVD LwhlHDomY7Ej00h4KPI11bXGpN5njCa8Bgn9rPhWZGiID0LQJhr4LKwrrN+gcXjKhz/F OxCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dBv7BPaK0SgXUmjE4kLA/8TfPQOIiXvmE5Q4CR/s/Xk=; b=vWKw2o+gdUxS5cmRq+jvvGAhPLiqSyYzf93kWSd/uyRxj8QX6TuB+I/ykQ86QCtfvC INDkWnKvLx36kxMKnJs1mYezwUzvb31ZAedlMVwPU8nRcQcm/0SwaFQmoiT+Aq7MZlP1 hU0vL2QD2c7/fBC/vbFitCiNrOTUgMRHPfjjYtcQV0YeBCQ0B9VSQL6VwmNqur69jZh9 jjJIgBmR1xNxp6qHS1GOcoooLcEWvSBGGfVqNbf8bzXtroWIzvVhOstwfRRoaMixO6k6 +Ej7ZcTG/+iiUKyP/RGaDnKL5S9saaVMarLxQgoZ95FcZiqCn8hunWkP99+5zrPDS2N1 HKiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IbTc6nV5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h2-20020a056402280200b00425c9955318si5738705ede.345.2022.05.06.06.19.21; Fri, 06 May 2022 06:19:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IbTc6nV5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356998AbiEDRde (ORCPT + 99 others); Wed, 4 May 2022 13:33:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356997AbiEDRJw (ORCPT ); Wed, 4 May 2022 13:09:52 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B30C48302; Wed, 4 May 2022 09:56:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id F02B0B827AC; Wed, 4 May 2022 16:56:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9DABCC385B2; Wed, 4 May 2022 16:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683413; bh=xc/x2fYg9+PWIqzwtVTIMnDACVX0XbLqEBNdcRwzJEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IbTc6nV5UOM7sMonfdqtmhXydBlLc0nO2QAfKyz+wIpmnaAgYHBaP4ljWsGnR0WHo EWzDLRiErgXyeKX07EkRIfOng8p/TH8Q4XS4i+0b6WRCRV8rEuKxozKCr4lMIFlkHP Gvybm658F/h0kVqImZhR5b3yUFSvoshnLMxX2o8g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Oleksandr Ocheretnyi , Miquel Raynal , Sasha Levin Subject: [PATCH 5.17 098/225] mtd: fix part field data corruption in mtd_info Date: Wed, 4 May 2022 18:45:36 +0200 Message-Id: <20220504153119.521567314@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oleksandr Ocheretnyi [ Upstream commit 37c5f9e80e015d0df17d0c377c18523002986851 ] Commit 46b5889cc2c5 ("mtd: implement proper partition handling") started using "mtd_get_master_ofs()" in mtd callbacks to determine memory offsets by means of 'part' field from mtd_info, what previously was smashed accessing 'master' field in the mtd_set_dev_defaults() method. That provides wrong offset what causes hardware access errors. Just make 'part', 'master' as separate fields, rather than using union type to avoid 'part' data corruption when mtd_set_dev_defaults() is called. Fixes: 46b5889cc2c5 ("mtd: implement proper partition handling") Signed-off-by: Oleksandr Ocheretnyi Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/20220417184649.449289-1-oocheret@cisco.com Signed-off-by: Sasha Levin --- include/linux/mtd/mtd.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 1ffa933121f6..12ed7bb071be 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -392,10 +392,8 @@ struct mtd_info { /* List of partitions attached to this MTD device */ struct list_head partitions; - union { - struct mtd_part part; - struct mtd_master master; - }; + struct mtd_part part; + struct mtd_master master; }; static inline struct mtd_info *mtd_get_master(struct mtd_info *mtd) -- 2.35.1