| Message ID | 20240822133908.1042240-3-lizetao1@huawei.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Some modifications to optimize code readability | expand |
On Thu, Aug 22, 2024 at 09:39:02PM +0800, Li Zetao wrote: > When copying data from skb, it needs to determine the copy length. > It is easier to understand using min() here. > > Signed-off-by: Li Zetao <lizetao1@huawei.com> However, I don't believe Bluetooth changes usually don't go through next-next. So I think this either needs to be reposted or get an ack from the maintainer (already CCed). Luiz, perhaps you can offer some guidance here? > --- > net/bluetooth/hidp/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c > index 707f229f896a..7bf24f2993ba 100644 > --- a/net/bluetooth/hidp/core.c > +++ b/net/bluetooth/hidp/core.c > @@ -294,7 +294,7 @@ static int hidp_get_raw_report(struct hid_device *hid, > > skb = session->report_return; > if (skb) { > - len = skb->len < count ? skb->len : count; > + len = min(skb->len, count); I am slightly dubious about this check, given the different types involved. Is using min_t appropriate (I don't know)? > memcpy(data, skb->data, len); > > kfree_skb(skb); > -- > 2.34.1 > >
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index 707f229f896a..7bf24f2993ba 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c @@ -294,7 +294,7 @@ static int hidp_get_raw_report(struct hid_device *hid, skb = session->report_return; if (skb) { - len = skb->len < count ? skb->len : count; + len = min(skb->len, count); memcpy(data, skb->data, len); kfree_skb(skb);
When copying data from skb, it needs to determine the copy length. It is easier to understand using min() here. Signed-off-by: Li Zetao <lizetao1@huawei.com> --- net/bluetooth/hidp/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)