Received-SPF: pass (google.com: domain of linux-kernel+bounces-189735-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Message-ID: <ff240b23-4143-4171-8dcc-1fdbf1802e8c@suse.de>
Date: Sun, 26 May 2024 14:27:56 +0200
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] tracing/probes: fix error check in parse_btf_field()
To: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
Cc: linux-trace-kernel@vger.kernel.org, Steven Rostedt <rostedt@goodmis.org>,
 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
 Alan Maguire <alan.maguire@oracle.com>,
 "open list:TRACING" <linux-kernel@vger.kernel.org>
References: <20240525182131.15740-1-clopez@suse.de>
 <20240526191708.860651c915600a535cc2e579@kernel.org>
Content-Language: en-US
From: =?UTF-8?Q?Carlos_L=C3=B3pez?= <clopez@suse.de>
In-Reply-To: <20240526191708.860651c915600a535cc2e579@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit


Hi,

On 26/5/24 12:17, Masami Hiramatsu (Google) wrote:
> On Sat, 25 May 2024 20:21:32 +0200
> Carlos López <clopez@suse.de> wrote:
> 
>> btf_find_struct_member() might return NULL or an error via the
>> ERR_PTR() macro. However, its caller in parse_btf_field() only checks
>> for the NULL condition. Fix this by using IS_ERR() and returning the
>> error up the stack.
>>
> 
> Thanks for finding it!
> I think this requires new error message for error_log file.
> Can you add the log as
> 
> trace_probe_log_err(ctx->offset, BTF_ERROR);
> 
> And define BTF_ERROR in ERRORS@kernel/trace/trace_probe.h ?

Sounds good, but should we perhaps reuse BAD_BTF_TID?

```
C(BAD_BTF_TID,		"Failed to get BTF type info."),\
```

`btf_find_struct_member()` fails if `type` is not a struct or if it runs
OOM while allocating the anon stack, so it seems appropriate.

Best,
Carlos

> Thank you,
> 
>> Fixes: c440adfbe3025 ("tracing/probes: Support BTF based data structure field access")
>> Signed-off-by: Carlos López <clopez@suse.de>
>> ---
>>   kernel/trace/trace_probe.c | 2 ++
>>   1 file changed, 2 insertions(+)
>>
>> diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
>> index 5e263c141574..5417e9712157 100644
>> --- a/kernel/trace/trace_probe.c
>> +++ b/kernel/trace/trace_probe.c
>> @@ -554,6 +554,8 @@ static int parse_btf_field(char *fieldname, const struct btf_type *type,
>>   			anon_offs = 0;
>>   			field = btf_find_struct_member(ctx->btf, type, fieldname,
>>   						       &anon_offs);
>> +			if (IS_ERR(field))
>> +				return PTR_ERR(field);
>>   			if (!field) {
>>   				trace_probe_log_err(ctx->offset, NO_BTF_FIELD);
>>   				return -ENOENT;
>> -- 
>> 2.35.3
>>
> 
> 

-- 
Carlos López
Security Engineer
SUSE Software Solutions