Message-ID: <4ddd3fe4-ed3c-495e-077c-1ac737488084@intel.com>
Date:   Wed, 8 Mar 2023 16:33:46 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.8.0
Subject: Re: [PATCH] xsk: Add missing overflow check in xdp_umem_reg
Content-Language: en-US
To:     Kal Conley <kal.conley@dectris.com>
CC:     =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Maciej Fijalkowski <maciej.fijalkowski@intel.com>,
        Jonathan Lemon <jonathan.lemon@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        "Alexei Starovoitov" <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        "Jesper Dangaard Brouer" <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>,
        <netdev@vger.kernel.org>, <bpf@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>
References: <20230307172306.786657-1-kal.conley@dectris.com>
 <20230308105130.1113833-1-kal.conley@dectris.com>
From:   Alexander Lobakin <aleksander.lobakin@intel.com>
In-Reply-To: <20230308105130.1113833-1-kal.conley@dectris.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?a2VkS2ZRZjZRcHFoVnJLSk9FY2VrOHNndnNiVkxCdkJtV200OVVzNnpNMmhX?=
 =?utf-8?B?alVESHQwbG8xd0NaZ2FzazlDSEg4L0VaNmNNV3AxMzA0eVRSU1hEQWJvM0lK?=
 =?utf-8?B?ZXVpdmk1TTdEVTY1SWNwNkpjNVhnUnZaQVpHVEFKckFISXNjL1VIMVk5QmhT?=
 =?utf-8?B?Nk43RitmLy9WSnVDNFJoL1pYbkxJckJBVWtTTVJTaFcvMWpuZm5qaHc5eUtP?=
 =?utf-8?B?SzJsTVpPSEVIQWZsMUpsbHplTUlVRmloWU5sWkt2VDRFa1lwZDBJZXpRRWQ4?=
 =?utf-8?B?Rk5nTmk2d040TG00amZBTEVGeElWWExwdUxxa2xEOUdUUWtBTjVtQnhWUXIy?=
 =?utf-8?B?eW9uWXBFT1ZjR3VQZVIvcTNpVmExTzBnaCtCWkdmVjBhZ1RmSnBTNTMzdDJJ?=
 =?utf-8?B?MTNteWtoTkYxT1hJT2lnOHFMY1ZlYlRVb05TWnZvVjY5NzBxUFJWb1E2ZVR3?=
 =?utf-8?B?L3gwUWdGb1VvbFJWL3dieWFINk1mbU5QZlh1RXZPVWhWeHdZTklITWRUSTFQ?=
 =?utf-8?B?aWt5WS9DU2p6a2FNVmdpY3F5TmVkRFNoQiswOVhSS1k2NEYxMzI5RStOQ0tq?=
 =?utf-8?B?NEVZVmVrQ0hZbmhaT0wvSEx5ZWN4V1NNdHBkRGhMK0s4OFN6Z0hWZXFRN0dO?=
 =?utf-8?B?NjdibjBaOTJ6SVZBaHRSa0s3eXNNOU9RMU1RL0hMUlBxQ2RtK3V6KzBHT2Fp?=
 =?utf-8?B?d2JWWjZhOHhSNzNYN2pWUWtkN3VyN0puT2c2QTJpSE1tdVpiR0RRS0RpOUwx?=
 =?utf-8?B?SlNhT0d2SDlBVExEQlU4VnNtVlk0ODVuaVY3LzgyUy8zN1I2aHZYZzA0aTNI?=
 =?utf-8?B?SG1kNmFqL3llaWU2ZmJKSEVkK2tPc0xBbi9FZEdDMHFtRGRQR3M1VStNZzBV?=
 =?utf-8?B?R1RBTFpubFd0NTRUY1lKUkc5UkZWb3J3dy95Z2FjdDkzRDdISUFxNDgxQ3hJ?=
 =?utf-8?B?dVFMN1lRRHFDUUo5UjJYUndVMWNYdS9waFRRMWNaaDBPam5ld1ZCTTV3blI3?=
 =?utf-8?B?Zk02VUdHQ2ZnTFkxSDZua2dPZXdZWE56c0ZTN05ydCtEZE1JeWJMQTNKOEpn?=
 =?utf-8?B?TGxVNGw3WWkvWlhqalpGdjl1VWM2MDlIMHZtNkNid1ZCQ3JwbkZDdVNhcVFQ?=
 =?utf-8?B?NmtXbzZxTFcyTE9DR3RiTnlIMXRHR25HMldiRTg5SHY5TUJyWnBTZEdlektk?=
 =?utf-8?B?WDlTYVZueTBNRkdteW9aM3AvV2RlMDRKT1oyMHdSbkgvT0RNQmR3emsyUExJ?=
 =?utf-8?B?emsvWEtDbzJpSTVkWGMzY0RCb0NtZUZmcFJyZW5HVGNUVjl5cGlEdkdySG5y?=
 =?utf-8?B?QXA3dWVLcDdzSGR6QjIvQ0ZkTldveFdDS21YUXo5cW9aeEpuTjNSck03cTVn?=
 =?utf-8?B?T3QycjAvcEN3SUhHMUNCTmU3dk9PczlMdE1Wd3JETDRvWkIxRks4M3RCQjlD?=
 =?utf-8?B?eXdWempPMUpxVytXdUwvalAvMXk5QzdJVEMybVJvc2RXNWF3QTdnTFgyL0FB?=
 =?utf-8?B?YU9sWDIrR243QjUxbmpYZngrREVtMGYxVit4N211bTIvbUpFeWdQaHREaDcx?=
 =?utf-8?B?Zit0cUZVMmNvb0RyNFVWUVl3L0ZnUmF2eVZxeVJwV0hzQjg1b2xSdCtrNHlS?=
 =?utf-8?B?SzdmUzFXMkxxbmd1QWtvcit4N3NkdE55MEpRcGhVbFRMYkgxcWhoTHVEU3BY?=
 =?utf-8?B?Y2FmQ1NINUo4K1JMU3BkQ0ZiZjVheENhYlFrQkwycDlnU09NRXVoT3dnd2Vu?=
 =?utf-8?B?SXE4TkFZYUpWQVJqcDFmZUNmLzYrRGhVcU10RGE3eXY1UVpnTGs4Ry9FeDBk?=
 =?utf-8?B?Y1VZTVpCOHVwUFlwNVVyd1NzWllZNjhjNk1oSHJsTVRoZmVUc0p2VmQ0Uk9W?=
 =?utf-8?B?blZsM1pNZjRhenNYVFQzck5SVlFHcHNKcFY2VzFTc3hFRnRZM0ZIeDdRcDJv?=
 =?utf-8?B?MDljT3JFWkUxRWRDTlNxTmorZUZqWFRybFp2RFdQaUhSa1pYaENJUElvdDhO?=
 =?utf-8?B?bUdEdVZrTTNVSER4aFFIMzYyNmpESHZUMENucVViTFZNRXVoYUF5d0E1YjZu?=
 =?utf-8?B?SlRnQkdWa0trQ2xjSXBSdGQzQVNuZ0dPY0FCZFlqeW5PTFNnN25hdEtNUmNW?=
 =?utf-8?B?a2ZBL3Vyb0ZST1JPMlp1ZkloSzFOaVR2K1BzWGZyUHlKTmFvZzRRNml0bkhm?=
 =?utf-8?Q?a3D93ruAoeD3QzkCBn8QRoI=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 98e5e42b-58e4-46dc-b16a-08db1feaa469
X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3625.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2023 15:34:44.6599
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ldGXCVl/0TrpMPOgaiDr211UuW8OnESjAKdx0dQ46iW0pdO782Vtt4QmxQ2hZEf1lbc3gDPCK9V9Jv2v1k9b0tleX+M/qD7lxplKf/VqiNM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB5197
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Kal Conley <kal.conley@dectris.com>
Date: Wed,  8 Mar 2023 11:51:30 +0100

> [PATCH] xsk: Add missing overflow check in xdp_umem_reg

You need to mark it properly. It must've been

[PATCH bpf v2] xsk: Add missing overflow check in xdp_umem_reg

instead.

> The number of chunks can overflow u32. Make sure to return -EINVAL on
> overflow.

I'd mention here that cast removal, so that reviewers wouldn't ask why
you did this.

> 
> Fixes: bbff2f321a86 ("xsk: new descriptor addressing scheme")
> Signed-off-by: Kal Conley <kal.conley@dectris.com>
> ---
>  net/xdp/xdp_umem.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c
> index 4681e8e8ad94..02207e852d79 100644
> --- a/net/xdp/xdp_umem.c
> +++ b/net/xdp/xdp_umem.c
> @@ -150,10 +150,11 @@ static int xdp_umem_account_pages(struct xdp_umem *umem)
>  
>  static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)
>  {
> -	u32 npgs_rem, chunk_size = mr->chunk_size, headroom = mr->headroom;
>  	bool unaligned_chunks = mr->flags & XDP_UMEM_UNALIGNED_CHUNK_FLAG;
> -	u64 npgs, addr = mr->addr, size = mr->len;
> -	unsigned int chunks, chunks_rem;
> +	u32 chunk_size = mr->chunk_size, headroom = mr->headroom;
> +	u64 addr = mr->addr, size = mr->len;
> +	u32 chunks_rem, npgs_rem;
> +	u64 chunks, npgs;
>  	int err;
>  
>  	if (chunk_size < XDP_UMEM_MIN_CHUNK_SIZE || chunk_size > PAGE_SIZE) {
> @@ -188,8 +189,8 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)
>  	if (npgs > U32_MAX)
>  		return -EINVAL;
>  
> -	chunks = (unsigned int)div_u64_rem(size, chunk_size, &chunks_rem);
> -	if (chunks == 0)
> +	chunks = div_u64_rem(size, chunk_size, &chunks_rem);
> +	if (!chunks || chunks > U32_MAX)
>  		return -EINVAL;
>  
>  	if (!unaligned_chunks && chunks_rem)
> @@ -202,7 +203,7 @@ static int xdp_umem_reg(struct xdp_umem *umem, struct xdp_umem_reg *mr)
>  	umem->headroom = headroom;
>  	umem->chunk_size = chunk_size;
>  	umem->chunks = chunks;
> -	umem->npgs = (u32)npgs;
> +	umem->npgs = npgs;
>  	umem->pgs = NULL;
>  	umem->user = NULL;
>  	umem->flags = mr->flags;

The code is fine to me.
Please resubmit with the fixed subject and expanded commit message.
I'd also prefer that you sent v3 as a separate mail, *not* as a reply to
this thread.

Thanks,
Olek