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;
Message-ID: <04c933c3-499a-e13b-c25d-a60e601dbd8b@axentia.se>
Date:   Thu, 15 Sep 2022 15:36:58 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.13.0
Subject: Re: [PATCH] i2c: mux: harden i2c_mux_alloc() against integer
 overflows
Content-Language: en-US
To:     Dan Carpenter <dan.carpenter@oracle.com>
Cc:     Wolfram Sang <wsa@kernel.org>,
        "Gustavo A. R. Silva" <gustavo@embeddedor.com>,
        linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org,
        kernel-janitors@vger.kernel.org
References: <YyMM8iVSHJ4ammsg@kili>
From:   Peter Rosin <peda@axentia.se>
In-Reply-To: <YyMM8iVSHJ4ammsg@kili>
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?LzZLMHB4MGRSTGh1dGtURzFGQmhocUpHck9CSTR4MzB3YzR3VXZtakxMNXl1?=
 =?utf-8?B?am9tSE83YW9wWEhLZHQyR0RxbC82b1FQZVJBenk0b2pCWGhIckFsMHdGRkhB?=
 =?utf-8?B?VVlxSEQ2MlJjUE9haWpSZW9LaE5ZdzlJcGNvWThHc1JIdEt2dWlpOUl0Z2Jq?=
 =?utf-8?B?Y3N5ekhkV2FGQVkvRmdROGlpaEc3NU8waThxOEFadjQ5UnVVYUxIMXlnOGls?=
 =?utf-8?B?OEZCVFBLR3hNcVNseDJlRXpNaDAwUGtLRW1aZU8xT3FLTjJROVVHWDVKbjBK?=
 =?utf-8?B?TzNLWVk4NStuL3Y1SVFVd1dVMy8rUytGQjgyMURLR2VjdTVaa1o4TkhDbDl4?=
 =?utf-8?B?eHJyd3BEWkZ2OUVmdjNWRExYK0dBZ2luM0RpOSt0bUxrSkNVcmFwUzFlQkgz?=
 =?utf-8?B?OWM0ejdsL1g4eEx0S2Uwbkt3NlZ6MzhyK1FyeUhrV05SWm9XZXJLZE5kYTJQ?=
 =?utf-8?B?RlA1cVAxcTBtNUJFcjlmTWJDUWlndHk4TkcrZi9GRVZPMWM2N0h0MVBFV0c5?=
 =?utf-8?B?WjM4aHVKbDZGK3llUTJFa2JMbkJDVHlkOG9mOXJGYjh3UG5wTmJ1a252UjIx?=
 =?utf-8?B?VXdpUGcyOXJCQThocjZseDVRKytIUHVPVjZXV3dNUW1CNkRLMU1TMHQvTXVo?=
 =?utf-8?B?NGNrRXpVdjNKMnFhdUVwUGR6dWNVYngzc1dwM2ZuaUxQQUZmekpCVDlWQjhU?=
 =?utf-8?B?WjBFc3VEZzM2OEF5YkxodXV0RjdjV2ZlYSt4TmtCUWNKbnhkSjVhblZzSmtU?=
 =?utf-8?B?dW9CQ1BwZlhzdTJXTjBJN0J3alpqNjE4SGZ0bEtzMGo3RUhIL1R0UWVjSmJ0?=
 =?utf-8?B?R3Y2UDg4aElDTEYwdFJyR0IrME5NQWovOEhVQm4yNVNIc3UzR05xalVzTnhW?=
 =?utf-8?B?Um9BUTUrQUk2bGsxMlpkdFhGcmRVR0NtRlRCb0NqS0dnZHZ1bFcrUXZrZTQy?=
 =?utf-8?B?SXZZYit0RmMzUFBtY08rRFV1ZGxlYW9yZlJ6d0dGQmNZK0orRFVOV0JUVlhI?=
 =?utf-8?B?YjM2YkFJcm1YamZWN3Jub3FJdWdEcFdBNEU2L1NpT1ZYRmlST2Y0d2ZscDVC?=
 =?utf-8?B?R0JHT3Bad1NTUE1zdkRraGlBVG8vVGQ3WHRYdmZ3eGFuQjRZMDhjdVEzY2dU?=
 =?utf-8?B?aUF3cVB5VjBtVkkzeXYxamlnY1FWb1JneCtBRElGRlY1QUJQSTU3Tjl5VnN2?=
 =?utf-8?B?L3E2QmQweFJhK0FsUmhPZTR6QzMvVHVSNkpYR25MRkhLeUZBNVU5ZEtrU1hk?=
 =?utf-8?B?R2o3ZGdEMzhSR0VIRmFLRTd1SWkxTzdaL3FUT0RSTThQMVZDRUdpMFlWZW5T?=
 =?utf-8?B?TVp3eFFuOTZtVHZXMkllQVJPKzVRd29zV2lKSW9jb3RnSGJFVDlEWUtyRlRa?=
 =?utf-8?B?dThBTmd2RjBkRmhrV3lvazZlWXJhOXdHdHJNSHRScGQyWFViYnBhMkpGcnlD?=
 =?utf-8?B?L0lEZ3NxNzNEWlZhOXd6RHo2VzZvaFJqU0szSk5hSGEvTUREUjdLZnoxS0xJ?=
 =?utf-8?B?QytMOTNlVmpVMmU1VjlDY2w4dk53SnJKVithU09iY1liYjdsYjduQ0lOdWNU?=
 =?utf-8?B?S0lkZzBTR1lYbGhubkJUNVJhTkEwelhHVStjei9hdDErbXVBZ2JzVm1FWVRW?=
 =?utf-8?B?RmFMU3NyOUk4QjkxVXIrWWNqYU1uQVdtMXh0WUZvbXJ6THJ5alFRbGoxL2w1?=
 =?utf-8?B?L2d5K0p6SHFMbSsrV3JFL3VrN3E0QmdsRGJ5S2p1MktGQStyekhsbmVaUmVx?=
 =?utf-8?B?TWNrdmJYS1FuVWxBcDM2UzVMazU5b1FBWU1ERTRRK3dmZDFObW5WRm1QNTNu?=
 =?utf-8?B?QUpReEtwckYrZVl3djdBajVDWEVvd2p3WFVyUnhGZUdFNkV4L25oeURJV3Fk?=
 =?utf-8?B?QnN5NG9hTTRzK0hxdVRjdGViVThDSVA0WkY2Z0o3QWs0UTM0VjNOV1krVHdN?=
 =?utf-8?B?V20rQktzNTN1bDFQakJaWDVQMkVpa3lOWjFaZnRrV3ZwZ2tZYWc5ZjVLTnk5?=
 =?utf-8?B?SjZackxxb3cza2hWTkRjbksxVDJKeWppZzZJY3RKQjFMUE1ta1hwVUNJQ3lL?=
 =?utf-8?B?TFYrQk5sZ3RpT0ZZK05Benp1ZVJVdXJEbG9zdm9hQ292ZVM3RHUwZ0RvSmo4?=
 =?utf-8?Q?GjU4yZVhVI8vvp4pjqYtdYRC/?=
X-OriginatorOrg: axentia.se
X-MS-Exchange-CrossTenant-Network-Message-Id: 8d77f6f6-d9d6-4475-2d09-08da971f5d99
X-MS-Exchange-CrossTenant-AuthSource: AM0PR02MB4436.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2022 13:36:59.8008
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Fj80hrfUMIMvPkmyzjZGfaB4vKI9JS/XyV5Tjnjs67qMG5cR4h2wfAvYRtrpHoZH
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR02MB6412
X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS 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

Hi Dan,

2022-09-15 at 13:30, Dan Carpenter wrote:
> A couple years back we went through the kernel an automatically
> converted size calculations to use struct_size() instead.  The
> struct_size() calculation is protected against integer overflows.
> 
> However it does not make sense to use the result from struct_size()
> for additional math operations as that would negate any safeness.

Indeed. Nice catch!

> Fixes: 1f3b69b6b939 ("i2c: mux: Use struct_size() in devm_kzalloc()")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Peter Rosin <peda@axentia.se>

Cheers,
Peter

> ---
>  drivers/i2c/i2c-mux.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
> index 774507b54b57..313904be5f3b 100644
> --- a/drivers/i2c/i2c-mux.c
> +++ b/drivers/i2c/i2c-mux.c
> @@ -243,9 +243,10 @@ struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent,
>  				   int (*deselect)(struct i2c_mux_core *, u32))
>  {
>  	struct i2c_mux_core *muxc;
> +	size_t mux_size;
>  
> -	muxc = devm_kzalloc(dev, struct_size(muxc, adapter, max_adapters)
> -			    + sizeof_priv, GFP_KERNEL);
> +	mux_size = struct_size(muxc, adapter, max_adapters);
> +	muxc = devm_kzalloc(dev, size_add(mux_size, sizeof_priv), GFP_KERNEL);
>  	if (!muxc)
>  		return NULL;
>  	if (sizeof_priv)