Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp13440656pxu; Sun, 3 Jan 2021 15:15:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxHO8a0UKWLb3UB6Af21gjGc+eA1rI8rxGHUIW+/9M7jxuUIn5uPinnCt0BwcwqwqMaDo/2 X-Received: by 2002:aa7:d2c9:: with SMTP id k9mr67994366edr.74.1609715729361; Sun, 03 Jan 2021 15:15:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609715729; cv=none; d=google.com; s=arc-20160816; b=VFz+B1fYmSUsHTtmi00nAtR9YtRJpGiUKRWkoT3TYPunlBzGTMpNAY1RyJ/NVLwmKD jVttIqUM1VxfDAjEd6308g4hVaSXJRR/HgOV3+EsA5xJ4KYBbgUAThMq1qSwWGSm1kOG fTi69Du/GCka4S5Sx0OSElWbVHaJ4YfwUcQ4+QSG6uqKbpV1iBZGVkOBtZ8xpU5ALpvR p1VBKHspnithTulYjIM+pFyhgHYHbup2JyhtTZ2Ky5cJok0s8Vw8B45kbdP/DmQpbEnW RgodObZlhNvdJCaD7UEkJ38FqcVvhFHKD0ejb/u+iv7J9n6FrPPYQe89Qedu5wlYlNyc 6BFg== 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:message-id:in-reply-to:date:references:organization :subject:cc:to:from:dkim-signature; bh=tJ9Si7uwTlF1+m4XAh1P6KDZfGpLXIZq6AArp/iMmMY=; b=Y7iGXlMbNlZGtMVTrxhyOZ0tqLrQxl4wejZlkEAH7RZsDU+wSfCnh1rm7ZEg4aN4Rw Q2qqimkz8YJnYvjlh+YfC97FmJS1ntA1D4tZ4Tm4vofAXF/psz/5ehQpvnw0znxB5VvL 6q5hlgreZu9S5Iax1hYRFQuLdZ4uWQIDAVypWdP66LdX7OBHyifOaeuNDXfqrw6/HNCq 1GHSEb3UGOdleNfhGNpFBwXoQ6GRdFCMK85eVqkpOu+BIv2PsP3Wvrb40rEuzTplymhc Oca4gK1c2U/D+QwkSAGIpHZXFwzb4AT/zGl1v/CSGfU+VcIdMV07cgY2KVGiGprkLI2z PiQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mork.no header.s=b header.b=Rl2CWHYN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mork.no Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e14si28167200ejr.169.2021.01.03.15.15.04; Sun, 03 Jan 2021 15:15:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@mork.no header.s=b header.b=Rl2CWHYN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mork.no Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727098AbhACVRD (ORCPT + 99 others); Sun, 3 Jan 2021 16:17:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725840AbhACVRD (ORCPT ); Sun, 3 Jan 2021 16:17:03 -0500 X-Greylist: delayed 680 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Sun, 03 Jan 2021 13:16:23 PST Received: from canardo.mork.no (canardo.mork.no [IPv6:2001:4641::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 102B1C061573 for ; Sun, 3 Jan 2021 13:16:22 -0800 (PST) Received: from miraculix.mork.no (miraculix.mork.no [IPv6:2001:4641:0:2:7627:374e:db74:e353]) (authenticated bits=0) by canardo.mork.no (8.15.2/8.15.2) with ESMTPSA id 103L4hgK030212 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sun, 3 Jan 2021 22:04:43 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mork.no; s=b; t=1609707883; bh=tJ9Si7uwTlF1+m4XAh1P6KDZfGpLXIZq6AArp/iMmMY=; h=From:To:Cc:Subject:References:Date:Message-ID:From; b=Rl2CWHYNakjmQtPotlTxNDabtYe/RZV9ne96VqhvcWG+KI1AQTYyjwjQBTnhyWa+f q+E561rOh30bBnwDz7TtCNkOeaz3mL8xREV0KLAZNXDyNgPtaPF2wL5DqeSslq/YfL iYQb7Y9m8/SBsabqzdjOgVVMDl/da7KPW4lu3ZA8= Received: from bjorn by miraculix.mork.no with local (Exim 4.94) (envelope-from ) id 1kwAYN-000Ecx-AR; Sun, 03 Jan 2021 22:04:43 +0100 From: =?utf-8?Q?Bj=C3=B8rn_Mork?= To: Jouni =?utf-8?Q?Sepp=C3=A4nen?= Cc: Oliver Neukum , linux-usb@vger.kernel.org, "David S. Miller" , Jakub Kicinski , Enrico Mioso , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net,stable] net: cdc_ncm: correct overhead in delayed_ndp_size Organization: m References: <20210103143602.95343-1-jks@iki.fi> Date: Sun, 03 Jan 2021 22:04:43 +0100 In-Reply-To: <20210103143602.95343-1-jks@iki.fi> ("Jouni =?utf-8?Q?Sepp?= =?utf-8?Q?=C3=A4nen=22's?= message of "Sun, 3 Jan 2021 16:36:02 +0200") Message-ID: <87ft3henpw.fsf@miraculix.mork.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Virus-Scanned: clamav-milter 0.102.4 at canardo X-Virus-Status: Clean Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Jouni Sepp=C3=A4nen writes: > + delayed_ndp_size =3D ctx->max_ndp_size + > + max(ctx->tx_ndp_modulus, > + ctx->tx_modulus + ctx->tx_remainder) - 1; You'll probably have to use something like max_t(u32, ctx->tx_ndp_modulus, ctx->tx_modulus + ctx->tx_remainder) =20=20 here as the test robot already said. Sorry for not seeing that earlier. Otherwise this looks very good to me. The bug is real and severe, and your patch appears to be the proper fix for it. Thanks a lot for figuring this out and taking the time to fixup this rather messy piece of code. Reviewed-by: Bj=C3=B8rn Mork