Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19;
From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc:     Paolo Abeni <pabeni@redhat.com>, Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>, UNGLinuxDriver@microchip.com,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Vladimir Oltean <vladimir.oltean@nxp.com>
Subject: [PATCH v1 net 0/2] fix shared vcap_props reference
Date:   Fri, 29 Apr 2022 16:30:47 -0700
Message-Id: <20220429233049.3726791-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jcmWLURkwZ0uDPsH0pxqzsctgn/gOMJILUh1CCdBcCYoKEgS2oNOABDdTXJS?=
 =?us-ascii?Q?2Xm/R/uSG/rUXXqxU1JYtNFmQMW1sDIKEcK5zKvMNldgZcUVHTNTcuFcoGfy?=
 =?us-ascii?Q?tdJEP/RHVMR53G2smxQPHyE/hkM8w7JIAdwr7L/LNCEgtb99fuFw+NWbVftt?=
 =?us-ascii?Q?VnyVkXTWJt/4DSZP4NXwajX4sZE75u2TL4BwTYHHdCeRd+ApDoOZEPdpRUD2?=
 =?us-ascii?Q?MhRqA28NLxIbfmafpZ4k9DDfw3/8tVzaYK0kWJx5MqruryJWFdYdfeE+HB26?=
 =?us-ascii?Q?JP15gv78elWzth92dokxC2ebJDkDDN+4F7aeMIcP5YO4v5cXRd/1T+VaJRAp?=
 =?us-ascii?Q?3bD0XwS2wvQkfhYw8gXk9eyX3ARVBm6ODppJQR4TKkpe91GRIVMXo+lC2uej?=
 =?us-ascii?Q?TxS9BEPAyektLZZdDhnGTj3HQfoc5/r0dkMz+7dRSChnHblSxViMUS341D8l?=
 =?us-ascii?Q?7n/pVnr1xivyBeTo1E3qddbmBeziluFoJBw747Aymx+DHIQvnuaii651/puB?=
 =?us-ascii?Q?DA6qx0kX4gAMSbLMs3Wgj/8GZACUKqxI2gieoaI39NxPnR5iv69to185c7e7?=
 =?us-ascii?Q?KscQ3P/HkGuzgPqCghbW/uQ7tgL2BgT3VH6ri8iCWGMDnxQn95NdrqrSUXHr?=
 =?us-ascii?Q?Ujmph/0XIepGXSwvFsj0d9nwmQArKkWDN9C7EPJDK+g3HNro68doQyjUQSiY?=
 =?us-ascii?Q?PDfJYrY0kNH48nKAM3vlSL/JYodqKXcdZfWKJGr5wc9IiyWd8fsm9m4YqoGa?=
 =?us-ascii?Q?1iND+9PNJBTnoJuDaMQG/YcVIAkirD4NIOPsdtFaSlix/5YWWxePIWv1wpvw?=
 =?us-ascii?Q?zYkeJFUoFssE4w57SnyaADwcW0YuKqS6WXp2GF+t4K2NQEKlj/gd+U3X/kFN?=
 =?us-ascii?Q?XM72/5/JO5UOPnqmPf9NaEZCBihYdpXmLeTpW2uf7ueUMe3aXaezemkksH7n?=
 =?us-ascii?Q?+vRuxSE3aMJ6UaIhEzLQMWNFgoZSuPrIjM0VKVgXvo3cGttpwZT6NsIVgtOK?=
 =?us-ascii?Q?4SaEfWsIWqt/o5WO3ctV98wNHUWoIyGGvdE06QaBtKwNjczyCIX7XphNdfIh?=
 =?us-ascii?Q?4O1WUJvmIP0uVr7EPEjA63g0lkiXSc4nhCUf3IYYJUydipgLr7s2VYouqN2w?=
 =?us-ascii?Q?xB5haPzmESGN76HBGk+20rakBWC8cWrIeiG0TT+Hjy2QpOHfhXhGbz3hjiyM?=
 =?us-ascii?Q?Lz3zp5YrO+j9ePpB6MufB8BR30yCuuJfNSaAWZ5OXrdBfFXcQIA0fcaejtSf?=
 =?us-ascii?Q?yt9aEWyqhOl6i3yWVUIYG5boP9Fr1S9OvALQjpJuCfS3Prc16ID1kP1NkI/H?=
 =?us-ascii?Q?8bvVGVU5jyw0H1JzmcHbc7yEecOTYwncKVNN94XR+fYzfXYofjpDITw2uLgw?=
 =?us-ascii?Q?SXft1uVNXX7fZldYcceEmxj0/T1VpcxdQqQiYGiQPyqaaJUqFfXbuSEOrCYL?=
 =?us-ascii?Q?thvutwr6yJCRfL7nYEeEb+Pt2catUcHj7a2oQGUExHeuQ9vLnNgF76VNcZEK?=
 =?us-ascii?Q?A3/HsZEfFD1tlQi1aKgEpC9P+FW3I393u6z+VL2G7FWaZsCjUlIIJbbdKadP?=
 =?us-ascii?Q?rkQK8JXfW/CKHpUuzRlYu/NtIRq7SB0CFtXw3OoFuftAz5iwDS5o0ZjEZWgr?=
 =?us-ascii?Q?Wgcz3mJYgaTSjZVwkQwB67EZTcsM9ODBuiEh334VBctexneGWnmZbVv2PVf6?=
 =?us-ascii?Q?cu2TdGUvK/XLtnnKCFl55WVZQukKcGupV7nLWZ/zMunCCQZAAjoJM9UTOeRX?=
 =?us-ascii?Q?X3cMgL3a1YmEJbjAoXzxP6AAbur1bir3Tp28P+U4+YdpzslkvFpA?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5564afff-7aec-4930-6ac0-08da2a385277
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2022 23:31:01.9251
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /KwQWmBTfLAeba7s8jjjDdMSt4B1HbWa20cjBPHJMkMTV/vQmMbidLZi3h5hKddIbeY03ugmwv/dFAxyctUCsdyS1UvJzDVe+MhhBfdYJIU=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5483
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE,
	SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Felix vcap_props get statically allocated at the file scope, while the
felix / ocelot instances get dynamically allocated at initialization. If
there's more than one instance, each instance will be writing over the
same vcap_props memory region, which would lead to corruption.

I don't have any hardware to confidently test the vcap portions of
Ocelot / Felix, so any testers would be appreciated.

Also, I believe the memcpy of a structure array should be
architecture-portable, but I'm not 100% confident there, so that might
be an area of extra scrutiny.


Colin Foster (2):
  net: ethernet: ocelot: rename vcap_props to clearly be an ocelot
    member
  net: mscc: ocelot: fix possible memory conflict for vcap_props

 drivers/net/dsa/ocelot/felix.c             |  3 +-
 drivers/net/dsa/ocelot/felix.h             |  2 +-
 drivers/net/dsa/ocelot/felix_vsc9959.c     |  2 +-
 drivers/net/dsa/ocelot/seville_vsc9953.c   |  2 +-
 drivers/net/ethernet/mscc/ocelot_flower.c  |  4 +-
 drivers/net/ethernet/mscc/ocelot_vcap.c    | 54 +++++++++++-----------
 drivers/net/ethernet/mscc/ocelot_vsc7514.c |  5 +-
 include/soc/mscc/ocelot.h                  | 34 +++++++++++++-
 include/soc/mscc/ocelot_vcap.h             | 32 -------------
 9 files changed, 71 insertions(+), 67 deletions(-)

-- 
2.25.1