Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <cfe6abea-8d00-8f8c-f84c-e6f27753b5d1@fb.com>
Date:   Wed, 18 May 2022 13:41:59 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0)
 Gecko/20100101 Thunderbird/91.9.0
Subject: Re: [PATCH bpf v3 1/2] bpf_trace: check size for overflow in
 bpf_kprobe_multi_link_attach
Content-Language: en-US
To:     Eugene Syromiatnikov <esyr@redhat.com>
Cc:     Jiri Olsa <jolsa@kernel.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Steven Rostedt <rostedt@goodmis.org>,
        Ingo Molnar <mingo@redhat.com>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <kafai@fb.com>,
        Song Liu <songliubraving@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>, netdev@vger.kernel.org,
        bpf@vger.kernel.org, linux-kernel@vger.kernel.org
References: <cover.1652876187.git.esyr@redhat.com>
 <39c4a91f2867684dc51c5395d26cb56ffe9d995d.1652876188.git.esyr@redhat.com>
 <412bf136-6a5b-f442-1e84-778697e2b694@fb.com>
 <20220518200010.GA29226@asgard.redhat.com>
From:   Yonghong Song <yhs@fb.com>
In-Reply-To: <20220518200010.GA29226@asgard.redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OFBwb0NOdXJSQ1hjcDNIcFp3MEdrbGlTK0NRM1VLZzZud0JCa0ZvV1RKckxO?=
 =?utf-8?B?cmZsU3BhNWQzeHk5dmlpNHBUL3U0M2hKTmttcWxLOHpybEgwaXJyMFB2aDFS?=
 =?utf-8?B?TVp0QXhYdGtyd1c2QllVMVorb1dTZHh2OVA5eUlNRE1Ub0pYeEdON3NuNDBP?=
 =?utf-8?B?M0hqUDdCbmt0aXhXMmNjcHFlZUhLQWs1OU9IUFUxNVZYN1lsSEMyaDFxeXJE?=
 =?utf-8?B?ZDcyeXNkbDczdEtwY2d4Vk9BemxSb2o0TVNNa0t1MFZQNUxzTXpHckRGYUw2?=
 =?utf-8?B?SjllTEtzOVNvMHdvUTUzYXRiQ2YwRkxrUkszTWpNMFdrYllKODhPcjFuUEFU?=
 =?utf-8?B?bjU5TnpiZjdvUTVWUnFhc0J2WnkwUG5TQjdENEpLQWcyT29DQVdDYS9lbFJu?=
 =?utf-8?B?Tzl4bmN6MVdVVUVwUjJ4bzN6ci96dXRCWmtGbENNaW80UUNTYjJuSzhOeUJU?=
 =?utf-8?B?NHlJckVOT0REazNYdEpxT1RFMUhSdTJvWGY1RytCMmdXWUZLSlhEb3B4eTdZ?=
 =?utf-8?B?aE9ybG04bUNJN3EwRWpDaEhrbWFJZVR4c1ZTQmtVRVZFK1RFcnFuR0dOK3Fr?=
 =?utf-8?B?UTdJc3BnV0Z5TzBIRVBzNWtkelFGU0RUUnJHSzhjUHFqWHBpRE51MzVVdWNo?=
 =?utf-8?B?NkZpa2JwSGEwcFMzRkRHY29WOXpmZE9QZjBua2ErNm14VVBQQ3RHQXloYklU?=
 =?utf-8?B?Z0hHSWhhVk00ZWVKZ0JHRlBiTnhjUjZ5VFBtRllZVnlBTDJjZTliRFpKcVhR?=
 =?utf-8?B?UmJWZ2trRnZkbExCNXQ2S242Y0VreWJGYnlOeFMwSWhObE1RZFRWcUc5U3V6?=
 =?utf-8?B?eXBTV1AyS2w1bk0zNEZheHhHbmx2bithT2JwUjI3OWpkRlNGaDVOUDQ1dVNv?=
 =?utf-8?B?aSs5REsxRThKUE9uYVdCclp5M2xERjVLaThzdUN4M1pRU1QrSGxsUWF4N01F?=
 =?utf-8?B?OHRyeGVCUHA5VFl0SUpYR3AzOW5veDRWT3FYbzc1RTUvdzY3OXFVMDNXZUtk?=
 =?utf-8?B?L2VvNmIzSUxmWHF4bEJWckd1SExEMVF4TVZNeXJQM1pweG55YllhRzYvZk1F?=
 =?utf-8?B?YXUzQjdYSW1OSW5hS3hHN2EwQWxBVjdMSTJzLy9WTVNoa2wwUjlHckVTaFhy?=
 =?utf-8?B?NXgzZjFJSWZzSFZVL2ZhVVkxQ3AwNk1rdEJraEdiSnNBNy90RS9XVXdEbFM4?=
 =?utf-8?B?dnVJc1ArQUJoRTA2bnpGUWNkUGxReFpzOGVBS0xMdkl0U2JEY1N4Vk5walBa?=
 =?utf-8?B?c0ZwWmwvQVByK1Q0N1ZmR1E3Mmlka3JRZmdsOWhrYTVxSEdsamFTWC92T1dj?=
 =?utf-8?B?RVBlb0E1eTlQajRqYkI5UW1INzh4eXUvYkxNMjIvWnpWblpweFJpaFFNd2xp?=
 =?utf-8?B?YzhzUnlrVVVDbFZPWjg5L1c1TDJYMmVESnF0ZGE1SXBscVJGSWJBa1ZVSHdM?=
 =?utf-8?B?OVgwWjdvaGRBcUgzV0VQS1lEWVQ1UUdUdm5uWVVoZHlUZ2hBcTgzdFg0Nkdk?=
 =?utf-8?B?VmpwZFJBaXFnbEVNWFFMRktXdkJJWmh0Tkp0Y1JFUTFIVHdQT09KN1IxeGlW?=
 =?utf-8?B?Wis4R3g0c0F0MHByNVhVdVVuWXAyNlN1QnZYNng0TlB3Rzl0V0ZGdFYrOGlB?=
 =?utf-8?B?bWlDcFlYSnpWODZtQ2pSenA3L3AxVUxNVHJ1VjdzSmRtREMxY0NOQjJFLzMv?=
 =?utf-8?B?cUdnQTdLRzgwZjdwM0pMZ21HVFU3WVhmM1E4a0hZWlNaWXJwd1lpdmpiaTVo?=
 =?utf-8?B?cVV0QzlSTkdObEZHRE52ZEN3b0laOWFsUlM0a2M0MDcwWWZyVFJjcWsvOFQ3?=
 =?utf-8?B?Q1FnaHp6WHcvemwyRVJXbGNyZ0xzRXNFcU01b00wYlRObFRubVFzVTNFRDZa?=
 =?utf-8?B?TjFzalBjcmFrT2Z4RVBhN2xQa1dhYWxOU3EyaHBsakYwYjN1V2h1bVp0ZS9K?=
 =?utf-8?B?c2RQbmJMdUhmOVMwSTBMYlhURWVmcmFnVm05aHl1UFIxdkdOTjlVRnl1NHBj?=
 =?utf-8?B?aDNIYURLMmdBVXdnVStwZGVQU1QzMFdHTUphRldkWTdhaElNSVNIY3dWN0FW?=
 =?utf-8?B?NGxEdDEzRm5VZkVVWHRrQlMyVm16emgvMldXbnJodWJXdTVXYmM5ZUo1cTFL?=
 =?utf-8?B?REpLTUZnN1drTEJXR3A2Q0I3M1hVUWQyU292L3MyNnNBekZUQjBqM0ZvSno3?=
 =?utf-8?B?MXhyRWlXcjZaem16dTJWdHBlVHArR3Q5WmJ0VGxFZzY5dG13Q3ZlNC96UkZk?=
 =?utf-8?B?dE01cG9mYjU4QTlHL2hCYUpQZ0N0U2V3L3VyemdRWVBZaEhERGhmMXBKZC9P?=
 =?utf-8?B?NHIrNTdGNHVqT0Uzb1lVVDZNdCttNmdoQXlTNnFXWU1pd3BzenlKWXllWjJO?=
 =?utf-8?Q?sRlL/3rONCmbd30A=3D?=
X-OriginatorOrg: fb.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a13f4880-7067-4c76-cbfb-08da390edcde
X-MS-Exchange-CrossTenant-AuthSource: SN6PR1501MB2064.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 20:42:02.5979
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: i2Qon/rFqfkPv1cL2vPrWeuFRLlUOIB8RHnQd7YaM0GhoDA/eyVnAMq1ncxBnTnn
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR15MB3716
X-Proofpoint-GUID: hlJCNmH0NPI8ZeRgDnCEGPez6cO-PIAV
X-Proofpoint-ORIG-GUID: hlJCNmH0NPI8ZeRgDnCEGPez6cO-PIAV
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.486,FMLib:17.11.64.514
 definitions=2022-05-18_06,2022-05-17_02,2022-02-23_01
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,RDNS_NONE,SPF_HELO_NONE,
	T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 5/18/22 1:00 PM, Eugene Syromiatnikov wrote:
> On Wed, May 18, 2022 at 09:34:22AM -0700, Yonghong Song wrote:
>> On 5/18/22 5:22 AM, Eugene Syromiatnikov wrote:
>>> -	size = cnt * sizeof(*syms);
>>> +	if (check_mul_overflow(cnt, (u32)sizeof(*syms), &size))
>>> +		return -EOVERFLOW;
>>
>> In mm/util.c kvmalloc_node(), we have
>>
>>          /* Don't even allow crazy sizes */
>>          if (unlikely(size > INT_MAX)) {
>>                  WARN_ON_ONCE(!(flags & __GFP_NOWARN));
>>                  return NULL;
>>          }
>>
>> Basically the maximum size to be allocated in INT_MAX.
>>
>> Here, we have 'size' as u32, which means if the size is 0xffff0000,
>> the check_mul_overflow will return false (no overflow) but
>> kvzalloc will still have a warning.
>>
>> I think we should change the type of 'size' to be 'int' which
>> should catch the above case and be consistent with
>> what kvmalloc_node() intends to warn.
> 
> Huh, it's a bitmore complicated as check_mul_overflow requires types to
> match; what do you think about
> 
> +	if (check_mul_overflow(cnt, (u32)sizeof(*syms), &size) || size > INT_MAX)
> 
> ?

This works for me.