asmad...@codewreck.org wrote on Sat, Dec 02, 2023 at 01:35:18PM +0900:
> > diff --git a/include/trace/events/9p.h b/include/trace/events/9p.h
> > index 4dfa6d7f83ba..8690a7086252 100644
> > --- a/include/trace/events/9p.h
> > +++ b/include/trace/events/9p.h
> > @@ -185,7 +185,8 @@ TRACE_EVENT(9p_protocol_dump,
> >                 __entry->clnt   =  clnt;
> >                 __entry->type   =  pdu->id;
> >                 __entry->tag    =  pdu->tag;
> > -               memcpy(__entry->line, pdu->sdata, P9_PROTO_DUMP_SZ);
> > +               memcpy(__entry->line, pdu->sdata,
> > +                           min(pdu->capacity, P9_PROTO_DUMP_SZ));

Building with W=1 yields a warning:
./include/linux/minmax.h:21:35: warning: comparison of distinct pointer types 
lacks a cast
...
./include/trace/events/9p.h:189:33: note: in expansion of macro ‘min’
  189 |                                 min(pdu->capacity, P9_PROTO_DUMP_SZ));

I've updated the patch to:
+                               min_t(size_t, pdu->capacity, P9_PROTO_DUMP_SZ));

and pushed to my -next branch:
https://github.com/martinetd/linux/commits/9p-next

-- 
Dominique Martinet | Asmadeus

Reply via email to