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;
From:   Yinjun Zhang <yinjun.zhang@corigine.com>
To:     Jialiang Wang <wangjialiang0806@163.com>,
        Simon Horman <simon.horman@corigine.com>,
        "kuba@kernel.org" <kuba@kernel.org>,
        "davem@davemloft.net" <davem@davemloft.net>,
        "edumazet@google.com" <edumazet@google.com>,
        "pabeni@redhat.com" <pabeni@redhat.com>,
        "niejianglei2021@163.com" <niejianglei2021@163.com>
CC:     oss-drivers <oss-drivers@corigine.com>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH v2] nfp: fix use-after-free in area_cache_get()
Thread-Topic: [PATCH v2] nfp: fix use-after-free in area_cache_get()
Thread-Index: AQHYrG6K7FBsW08rDkqTULILikrQMK2nik7A
Date:   Wed, 10 Aug 2022 04:31:36 +0000
Message-ID: <DM6PR13MB3705EDC32EDE9FD97DA47F8EFC659@DM6PR13MB3705.namprd13.prod.outlook.com>
References: <20220810040445.46015-1-wangjialiang0806@163.com>
In-Reply-To: <20220810040445.46015-1-wangjialiang0806@163.com>
Accept-Language: en-US, zh-CN
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?WnjD+9DsHhuDMKIZAdqlKBdxEihORmek8GoYWhedpVQPA4AlcLzndkAUOge9?=
 =?us-ascii?Q?pfT00gqxzoRV4Lg8Ia0dm3U/DjLwrn+fb8jNHa5N3KFxvOi3jGTzBxJD24JC?=
 =?us-ascii?Q?4b8pNj8y2j9Dd3ERTRlBezdWlOteCwUhnfoL3ygbRh7gLu8JXggXA3Cy0as1?=
 =?us-ascii?Q?Z2WVhxxATMowGShDnFekOojzONBBcdvQ2uJqD23QC3ZyX/Sw2fw1J+aeI0p6?=
 =?us-ascii?Q?rMpiKd33SICsLc+1fecmM2xRbDZzRb7V5o36QPW3NJbpo11jxIDf+BRv5ZMB?=
 =?us-ascii?Q?toQ7cVmPHcN9Mu1RSKg0Im3WqYZJEPMjWzOztMWYmXqT6VssdJ84ClrsTLA6?=
 =?us-ascii?Q?tCBzSK/H69MjhToXMhdZwu567ZznMuaDA+9DGM/lDDJ2k/haVv4yCTGtVVHq?=
 =?us-ascii?Q?0nfJ5abQsSbSTFHL3rF/KIi0e6bketr/iEdPL36R2aHBMiAERFUO1zsMypl2?=
 =?us-ascii?Q?ye5lEEkplfV869K1KpQjFzNkRfE5Jt1J+IOP4SMAhFhvnxKsSXwjZt2mFrEe?=
 =?us-ascii?Q?QS2qD5MVQiojf+81Q/V8B+DowopM/ABC1+edmdPsjPbe/Ac+siqaDTqBf1DQ?=
 =?us-ascii?Q?uAK3deCd0+UiQbzr7e6r9L9IcjN/DYLSjzAUjqFrNd7UGN+Fx3W149FLtnwk?=
 =?us-ascii?Q?zTr6gBfItMAwWeZNHSjhaq+5gAAcYjY0slUes55hwY7wPZS4kA007yEg0veb?=
 =?us-ascii?Q?i2RFLGxjVorJ9H0+c1lKJqRwHd9xMfo9PL/hLJYu4Ujxh4G1mmsD7Vjo7P0l?=
 =?us-ascii?Q?f4b5Uf4O0AsL6ZL4l/7uI2zKrFuc34JTieSmI8iKVAm/X8CB/az/pLFFgtFG?=
 =?us-ascii?Q?4Z+PH2To1bPC5PG7cRd7VXyKcrlR4BFpDQ/8mAFECFeeoSCTa0/lQzwdkmlX?=
 =?us-ascii?Q?61cOGX8jfK2rc2I78XeiQQibej79KPvq5joWhVnp5C677eAAGsji2VOL37d3?=
 =?us-ascii?Q?yJqxoxRErekiymzjmHozelNBZXlChEQlmx2yxEBZQ39kJWyllc/uzlBmiGj+?=
 =?us-ascii?Q?ZtoTbs8MNBaL6/TBzFudNM5FL5PYUgGqE3atrF/hRdBOBDaKFKVLlyNCGZ0I?=
 =?us-ascii?Q?9WJDhMa+cGQpFwPpsVcQEq4Fg5g+QGUVYroZ79MB3DHrBaxKivjY0G5OqcUj?=
 =?us-ascii?Q?lLrRqLjBY4NTIpNj/RL1ywFOfhEVr5JxdgPZXj+4dpODNlzNPhRn/OmRsGsF?=
 =?us-ascii?Q?g0HDgNbsbalAvqqLTF7AWXY9DuBhN3N76O+XmXwOsbv8sSvyk0liaPEFH6aj?=
 =?us-ascii?Q?M3oVPdUrNiUKMfdBqniuKjTGcyWvrPfsGsKOMF6fTQz2WZvExkZQXcVrbsCf?=
 =?us-ascii?Q?7PuBCe3t4MC3eVXvjKxKdH+CU9XWS0PJ9M6wBZ2G/TrGmHg5pw0OK0PsNDoM?=
 =?us-ascii?Q?hFKevWEEnrTMAEqiltzvLlUruqPdKEte8oGnN1tUdbev02mboIEKxKmIUs0v?=
 =?us-ascii?Q?Ii4hkiVM8TesoIk45Hws3BuVOmWNPHRWkgbAEcEmgd+tplZ1YSkCa0MuDFxu?=
 =?us-ascii?Q?+d7DaFdMbS34QeXLxWCL4wYDSLL+PNhdWvS8x1ejxWe1tPfvhcmWkYsUVoAm?=
 =?us-ascii?Q?8MAI3dSo/JxPEB6GKijaUyflNvwUICBGJnWm1JbC1ml0r10ZFeYJJnFNX+Uj?=
 =?us-ascii?Q?Xg=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DM6PR13MB3705.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 33e56c58-8fcd-4e79-a9a9-08da7a893678
X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Aug 2022 04:31:36.9175
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: fe128f2c-073b-4c20-818e-7246a585940c
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: xo+PIo+wNVy5pTnokM+A8nePTt2GPLu6osWWJ96MCS0Su9WmFc8lZe5NrVKNlrjwxomJgA74CIz0vhz2bhGjq05L3UEt+eQRUKvFX7Aeabk=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR13MB3755
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, 10 Aug 2022 12:04:45 +0800 Jialiang Wang wrote:
> diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
> b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
> index 34c0d2ddf9ef..a83b8ee49062 100644
> --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
> +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
> @@ -873,10 +873,6 @@ area_cache_get(struct nfp_cpp *cpp, u32 id,
>  		cache->addr =3D 0;
>  	}
>=20
> -	/* Adjust the start address to be cache size aligned */
> -	cache->id =3D id;
> -	cache->addr =3D addr & ~(u64)(cache->size - 1);
> -
>  	/* Re-init to the new ID and address */
>  	if (cpp->op->area_init) {
>  		err =3D cpp->op->area_init(cache->area,
> @@ -894,6 +890,10 @@ area_cache_get(struct nfp_cpp *cpp, u32 id,
>  		return NULL;
>  	}
>=20
> +	/* Adjust the start address to be cache size aligned */
> +	cache->id =3D id;
> +	cache->addr =3D addr & ~(u64)(cache->size - 1);

`cache->addr` is used in `area_init`, so it should be set in advance.

> +
>  exit:
>  	/* Adjust offset */
>  	*offset =3D addr - cache->addr;
> --
> 2.17.1