mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
cbf299c86c
Handle error from copy_to_user in read_file_eeprom.
Fix compilarion warning:
/__w/openwrt/openwrt/openwrt/build_dir/target-x86_64-openwrt-linux-musl_musl/linux-x86_64/backports-6.1.24/drivers/net/wireless/ath/ath9k/debug.c: In function 'read_file_eeprom':
/__w/openwrt/openwrt/openwrt/build_dir/target-x86_64-openwrt-linux-musl_musl/linux-x86_64/backports-6.1.24/drivers/net/wireless/ath/ath9k/debug.c:1451:17: error: ignoring return value of 'copy_to_user' declared with attribute 'warn_unused_result' [-Werror=unused-result]
1451 | copy_to_user(user_buf, from, bytes);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
67 lines
1.7 KiB
Diff
67 lines
1.7 KiB
Diff
--- a/drivers/net/wireless/ath/ath9k/debug.c
|
|
+++ b/drivers/net/wireless/ath/ath9k/debug.c
|
|
@@ -1413,6 +1413,54 @@ void ath9k_deinit_debug(struct ath_softc
|
|
ath9k_cmn_spectral_deinit_debug(&sc->spec_priv);
|
|
}
|
|
|
|
+static ssize_t read_file_eeprom(struct file *file, char __user *user_buf,
|
|
+ size_t count, loff_t *ppos)
|
|
+{
|
|
+ struct ath_softc *sc = file->private_data;
|
|
+ struct ath_hw *ah = sc->sc_ah;
|
|
+ struct ath_common *common = ath9k_hw_common(ah);
|
|
+ int bytes = 0;
|
|
+ int pos = *ppos;
|
|
+ int size = 4096;
|
|
+ u16 val;
|
|
+ int i;
|
|
+
|
|
+ if (AR_SREV_9300_20_OR_LATER(ah))
|
|
+ size = 16384;
|
|
+
|
|
+ if (*ppos < 0)
|
|
+ return -EINVAL;
|
|
+
|
|
+ if (count > size - *ppos)
|
|
+ count = size - *ppos;
|
|
+
|
|
+ for (i = *ppos / 2; count > 0; count -= bytes, *ppos += bytes, i++) {
|
|
+ void *from = &val;
|
|
+
|
|
+ if (!common->bus_ops->eeprom_read(common, i, &val))
|
|
+ val = 0xffff;
|
|
+
|
|
+ if (*ppos % 2) {
|
|
+ from++;
|
|
+ bytes = 1;
|
|
+ } else if (count == 1) {
|
|
+ bytes = 1;
|
|
+ } else {
|
|
+ bytes = 2;
|
|
+ }
|
|
+ if (copy_to_user(user_buf, from, bytes))
|
|
+ return -EFAULT;
|
|
+ user_buf += bytes;
|
|
+ }
|
|
+ return *ppos - pos;
|
|
+}
|
|
+
|
|
+static const struct file_operations fops_eeprom = {
|
|
+ .read = read_file_eeprom,
|
|
+ .open = simple_open,
|
|
+ .owner = THIS_MODULE
|
|
+};
|
|
+
|
|
int ath9k_init_debug(struct ath_hw *ah)
|
|
{
|
|
struct ath_common *common = ath9k_hw_common(ah);
|
|
@@ -1432,6 +1479,8 @@ int ath9k_init_debug(struct ath_hw *ah)
|
|
ath9k_tx99_init_debug(sc);
|
|
ath9k_cmn_spectral_init_debug(&sc->spec_priv, sc->debug.debugfs_phy);
|
|
|
|
+ debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
|
|
+ &fops_eeprom);
|
|
debugfs_create_devm_seqfile(sc->dev, "dma", sc->debug.debugfs_phy,
|
|
read_file_dma);
|
|
debugfs_create_devm_seqfile(sc->dev, "interrupt", sc->debug.debugfs_phy,
|