[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240822133908.1042240-2-lizetao1@huawei.com>
Date: Thu, 22 Aug 2024 21:39:01 +0800
From: Li Zetao <lizetao1@...wei.com>
To: <davem@...emloft.net>, <edumazet@...gle.com>, <kuba@...nel.org>,
<pabeni@...hat.com>, <marcel@...tmann.org>, <johan.hedberg@...il.com>,
<luiz.dentz@...il.com>, <idryomov@...il.com>, <xiubli@...hat.com>,
<dsahern@...nel.org>, <trondmy@...nel.org>, <anna@...nel.org>,
<chuck.lever@...cle.com>, <jlayton@...nel.org>, <neilb@...e.de>,
<okorniev@...hat.com>, <Dai.Ngo@...cle.com>, <tom@...pey.com>,
<jmaloy@...hat.com>, <ying.xue@...driver.com>, <lizetao1@...wei.com>,
<linux@...blig.org>, <jacob.e.keller@...el.com>, <willemb@...gle.com>,
<kuniyu@...zon.com>, <wuyun.abel@...edance.com>, <quic_abchauha@...cinc.com>,
<gouhao@...ontech.com>
CC: <netdev@...r.kernel.org>, <linux-bluetooth@...r.kernel.org>,
<ceph-devel@...r.kernel.org>, <linux-nfs@...r.kernel.org>,
<tipc-discussion@...ts.sourceforge.net>
Subject: [PATCH net-next 1/8] atm: use min() to simplify the code
When copying data to user, it needs to determine the copy length.
It is easier to understand using min() here.
Signed-off-by: Li Zetao <lizetao1@...wei.com>
---
net/atm/addr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/atm/addr.c b/net/atm/addr.c
index 0530b63f509a..6c4c942b2cb9 100644
--- a/net/atm/addr.c
+++ b/net/atm/addr.c
@@ -136,7 +136,7 @@ int atm_get_addr(struct atm_dev *dev, struct sockaddr_atmsvc __user * buf,
unsigned long flags;
struct atm_dev_addr *this;
struct list_head *head;
- int total = 0, error;
+ size_t total = 0, error;
struct sockaddr_atmsvc *tmp_buf, *tmp_bufp;
spin_lock_irqsave(&dev->lock, flags);
@@ -155,7 +155,7 @@ int atm_get_addr(struct atm_dev *dev, struct sockaddr_atmsvc __user * buf,
memcpy(tmp_bufp++, &this->addr, sizeof(struct sockaddr_atmsvc));
spin_unlock_irqrestore(&dev->lock, flags);
error = total > size ? -E2BIG : total;
- if (copy_to_user(buf, tmp_buf, total < size ? total : size))
+ if (copy_to_user(buf, tmp_buf, min(total, size)))
error = -EFAULT;
kfree(tmp_buf);
return error;
--
2.34.1
Powered by blists - more mailing lists