batman-adv: Fix DAT candidate selection on little endian systems
Subsystems (7)
Sasha Levin
maintainerPATCH 1/9 batman-adv: Fix DAT candidate selection on little endian systems
From: Sven Eckelmann <[email protected]>
[ Upstream commit 4cc4a1708903f404d2ca0dfde30e71e052c6cbc9 ]
The distributed arp table is using a DHT to store and retrieve MAC address information for an IP address. This is done using unicast messages to selected peers. The potential peers are looked up using the IP address and the VID.
While the IP address is always stored in big endian byte order, this is not the case of the VID. It can (depending on the host system) either be big endian or little endian. The host must therefore always convert it to big endian to ensure that all devices calculate the same peers for the same lookup data.
--- net/batman-adv/distributed-arp-table.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/batman-adv/distributed-arp-table.c +3 -1
@@ -226,6 +226,7 @@ static u32 batadv_hash_dat(const void *data, u32 size)u32 hash =0 ;const struct batadv_dat_entry *dat = data;const unsigned char *key; +__be16 vid;u32 i; key = (const unsigned char *)&dat->ip;
@@ -235,7 +236,8 @@ static u32 batadv_hash_dat(const void *data, u32 size) hash ^= (hash >>6 ); } - key = (const unsigned char *)&dat->vid; + vid =htons (dat->vid); + key = (__force const unsigned char *)&vid;for (i =0 ; i <sizeof (dat->vid); i++) { hash += key[i]; hash += (hash <<10 );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/9 clk: mmp2: Fix the order of timer mux parents
From: Lubomir Rintel <[email protected]>
[ Upstream commit 8bea5ac0fbc5b2103f8779ddff216122e3c2e1ad ]
Determined empirically, no documentation is available.
The OLPC XO-1.75 laptop used parent 1, that one being VCTCXO/4 (65MHz), but thought it's a VCTCXO/2 (130MHz). The mmp2 timer driver, not knowing what is going on, ended up just dividing the rate as of
commit f36797ee4380 ("ARM: mmp/mmp2: dt: enable the clock")'
--- drivers/clk/mmp/clk-of-mmp2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/mmp/clk-of-mmp2.c +1 -1
@@ -134,7 +134,7 @@ static DEFINE_SPINLOCK(ssp3_lock);static const char *ssp_parent_names[] = {"vctcxo_4" ,"vctcxo_2" ,"vctcxo" ,"pll1_16" };static DEFINE_SPINLOCK (timer_lock); -static const char *timer_parent_names[] = {"clk32" ,"vctcxo_2" ,"vctcxo_4" ,"vctcxo" }; +static const char *timer_parent_names[] = {"clk32" ,"vctcxo_4" ,"vctcxo_2" ,"vctcxo" };static DEFINE_SPINLOCK (reset_lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 3/9 ixgbevf: Remove limit of 10 entries for unicast filter list
In reply to Sasha LevinFrom: Radoslaw Tyl <[email protected]>
[ Upstream commit aa604651d523b1493988d0bf6710339f3ee60272 ]
Currently, though the FDB entry is added to VF, it does not appear in RAR filters. VF driver only allows to add 10 entries. Attempting to add another causes an error. This patch removes limitation and allows use of all free RAR entries for the FDB if needed.
--- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +0 -5
@@ -1861,11 +1861,6 @@ static int ixgbevf_write_uc_addr_list(struct net_device *netdev)struct ixgbe_hw *hw = &adapter->hw;int count =0 ; -if ((netdev_uc_count (netdev)) >10 ) { -pr_err ("Too many unicast filters - No Space\n" ); -return -ENOSPC ; - } -if (!netdev_uc_empty (netdev)) {struct netdev_hw_addr *ha;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 4/9 ixgbe: Fix calculation of queue with VFs and flow director on interface flap
In reply to Sasha LevinFrom: Cambda Zhu <[email protected]>
[ Upstream commit 4fad78ad6422d9bca62135bbed8b6abc4cbb85b8 ]
This patch fixes the calculation of queue when we restore flow director filters after resetting adapter. In ixgbe_fdir_filter_restore(), filter's vf may be zero which makes the queue outside of the rx_ring array.
The calculation is changed to the same as ixgbe_add_ethtool_fdir_entry().
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 37 ++++++++++++++----- 1 file changed, 27 insertions(+), 10 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +27 -10
@@ -4532,7 +4532,7 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter)struct ixgbe_hw *hw = &adapter->hw;struct hlist_node *node2;struct ixgbe_fdir_filter *filter; -u64 action; +u8 queue;spin_lock (&adapter->fdir_perfect_lock);
@@ -4541,17 +4541,34 @@ static void ixgbe_fdir_filter_restore(struct ixgbe_adapter *adapter)hlist_for_each_entry_safe (filter, node2, &adapter->fdir_filter_list, fdir_node) { - action = filter->action; -if (action !=IXGBE_FDIR_DROP_QUEUE && action !=0 ) - action = - (action >>ETHTOOL_RX_FLOW_SPEC_RING_VF_OFF ) -1 ; +if (filter->action ==IXGBE_FDIR_DROP_QUEUE ) { + queue =IXGBE_FDIR_DROP_QUEUE ; + }else { +u32 ring =ethtool_get_flow_spec_ring (filter->action); +u8 vf =ethtool_get_flow_spec_ring_vf (filter->action); + +if (!vf && (ring >= adapter->num_rx_queues)) { +e_err (drv,"FDIR restore failed without VF, ring: %u\n" , + ring); +continue ; + }else if (vf && + ((vf > adapter->num_vfs) || + ring >= adapter->num_rx_queues_per_pool)) { +e_err (drv,"FDIR restore failed with VF, vf: %hhu, ring: %u\n" , + vf, ring); +continue ; + } + +/* Map the ring onto the absolute queue index */ +if (!vf) + queue = adapter->rx_ring[ring]->reg_idx; +else + queue = ((vf -1 ) * + adapter->num_rx_queues_per_pool) + ring; + }ixgbe_fdir_write_perfect_filter_82599 (hw, - &filter->filter, - filter->sw_idx, - (action ==IXGBE_FDIR_DROP_QUEUE ) ? -IXGBE_FDIR_DROP_QUEUE : - adapter->rx_ring[action]->reg_idx); + &filter->filter, filter->sw_idx, queue); }spin_unlock (&adapter->fdir_perfect_lock);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 5/9 netfilter: fix a use-after-free in mtype_destroy()
In reply to Sasha LevinFrom: Cong Wang <[email protected]>
[ Upstream commit c120959387efa51479056fd01dc90adfba7a590c ]
map->members is freed by ip_set_free() right before using it in mtype_ext_cleanup() again. So we just have to move it down.
--- net/netfilter/ipset/ip_set_bitmap_gen.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/ipset/ip_set_bitmap_gen.h +1 -1
@@ -66,9 +66,9 @@ mtype_destroy(struct ip_set *set)if (SET_WITH_TIMEOUT (set))del_timer_sync (&map->gc); -ip_set_free (map->members);if (set->dsize && set->extensions &IPSET_EXT_DESTROY )mtype_ext_cleanup (set); +ip_set_free (map->members);ip_set_free (map); set->data =NULL ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 6/9 r8152: add missing endpoint sanity check
In reply to Sasha LevinFrom: Johan Hovold <[email protected]>
[ Upstream commit 86f3f4cd53707ceeec079b83205c8d3c756eca93 ]
Add missing endpoint sanity check to probe in order to prevent a NULL-pointer dereference (or slab out-of-bounds access) when retrieving the interrupt-endpoint bInterval on ndo_open() in case a device lacks the expected endpoints.
--- drivers/net/usb/r8152.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/usb/r8152.c +3 -0
@@ -4243,6 +4243,9 @@ static int rtl8152_probe(struct usb_interface *intf,return -ENODEV ; } +if (intf->cur_altsetting->desc.bNumEndpoints <3 ) +return -ENODEV ; +usb_reset_device (udev); netdev =alloc_etherdev (sizeof (struct r8152 ));if (!netdev) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/9 wireless: wext: avoid gcc -O3 warning
In reply to Sasha LevinFrom: Arnd Bergmann <[email protected]>
[ Upstream commit e16119655c9e6c4aa5767cd971baa9c491f41b13 ]
After the introduction of CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE_O3, the wext code produces a bogus warning:
In function 'iw_handler_get_iwstats',
inlined from 'ioctl_standard_call' at net/wireless/wext-core.c:1015:9, inlined from 'wireless_process_ioctl' at net/wireless/wext-core.c:935:10, inlined from 'wext_ioctl_dispatch.part.8' at net/wireless/wext-core.c:986:8, inlined from 'wext_handle_ioctl':net/wireless/wext-core.c:671:3: error: argument 1 null where non-null expected [-Werror=nonnull]
memcpy(extra, stats, sizeof(struct iw_statistics)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from arch/x86/include/asm/string.h:5,net/wireless/wext-core.c: In function 'wext_handle_ioctl':arch/x86/include/asm/string_64.h:14:14: note: in a call to function 'memcpy' declared here
The problem is that ioctl_standard_call() sometimes calls the handler with a NULL argument that would cause a problem for iw_handler_get_iwstats. However, iw_handler_get_iwstats never actually gets called that way.
Marking that function as noinline avoids the warning and leads to slightly smaller object code as well.
--- net/wireless/wext-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/wireless/wext-core.c +2 -1
@@ -656,7 +656,8 @@ struct iw_statistics *get_wireless_stats(struct net_device *dev)return NULL ; } -static int iw_handler_get_iwstats (struct net_device * dev, +/* noinline to avoid a bogus warning with -O3 */ +static noinline int iw_handler_get_iwstats(struct net_device * dev,struct iw_request_info * info,union iwreq_data * wrqu,char * extra)
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/9 cfg80211: check for set_wiphy_params
In reply to Sasha LevinFrom: Johannes Berg <[email protected]>
[ Upstream commit 24953de0a5e31dcca7e82c8a3c79abc2dfe8fb6e ]
Check if set_wiphy_params is assigned and return an error if not, some drivers (e.g. virt_wifi where syzbot reported it) don't have it.
--- net/wireless/rdev-ops.h | 4 ++++ 1 file changed, 4 insertions(+)
net/wireless/rdev-ops.h +4 -0
@@ -517,6 +517,10 @@ static inline int rdev_set_wiphy_params(struct cfg80211_registered_device *rdev, u32 changed) { int ret; + +if (!rdev->ops->set_wiphy_params) +return -EOPNOTSUPP ; +trace_rdev_set_wiphy_params (&rdev->wiphy, changed); ret = rdev->ops->set_wiphy_params (&rdev->wiphy, changed);trace_rdev_return_int (&rdev->wiphy, ret);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/9 scsi: mptfusion: Fix double fetch bug in ioctl
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 28d76df18f0ad5bcf5fa48510b225f0ed262a99b ]
Tom Hatskevich reported that we look up "iocp" then, in the called functions we do a second copy_from_user() and look it up again. The problem that could cause is:
drivers/message/fusion/mptctl.c
674 /* All of these commands require an interrupt or
675 * are unknown/illegal.
676 */
677 if ((ret = mptctl_syscall_down(iocp, nonblock)) != 0)
^^^^
We take this lock.
678 return ret;
679
680 if (cmd == MPTFWDOWNLOAD)
681 ret = mptctl_fw_download(arg);
^^^Then the user memory changes and we look up "iocp" again but a different one so now we are holding the incorrect lock and have a race condition.
682 else if (cmd == MPTCOMMAND) 683 ret = mptctl_mpt_command(arg);
The security impact of this bug is not as bad as it could have been because these operations are all privileged and root already has enormous destructive power. But it's still worth fixing.
This patch passes the "iocp" pointer to the functions to avoid the second lookup. That deletes 100 lines of code from the driver so it's a nice clean up as well.
--- drivers/message/fusion/mptctl.c | 213 ++++++++------------------------ 1 file changed, 50 insertions(+), 163 deletions(-)
drivers/message/fusion/mptctl.c +50 -163
@@ -100,19 +100,19 @@ struct buflist {* Function prototypes. Called from OS entry point mptctl_ioctl. * arg contents specific to function. */ -static int mptctl_fw_download (unsigned long arg); -static int mptctl_getiocinfo (unsigned long arg,unsigned int cmd); -static int mptctl_gettargetinfo (unsigned long arg); -static int mptctl_readtest (unsigned long arg); -static int mptctl_mpt_command (unsigned long arg); -static int mptctl_eventquery (unsigned long arg); -static int mptctl_eventenable (unsigned long arg); -static int mptctl_eventreport (unsigned long arg); -static int mptctl_replace_fw (unsigned long arg); - -static int mptctl_do_reset (unsigned long arg); -static int mptctl_hp_hostinfo (unsigned long arg,unsigned int cmd); -static int mptctl_hp_targetinfo (unsigned long arg); +static int mptctl_fw_download (MPT_ADAPTER *iocp,unsigned long arg); +static int mptctl_getiocinfo (MPT_ADAPTER *iocp,unsigned long arg,unsigned int cmd); +static int mptctl_gettargetinfo (MPT_ADAPTER *iocp,unsigned long arg); +static int mptctl_readtest (MPT_ADAPTER *iocp,unsigned long arg); +static int mptctl_mpt_command (MPT_ADAPTER *iocp,unsigned long arg); +static int mptctl_eventquery (MPT_ADAPTER *iocp,unsigned long arg); +static int mptctl_eventenable (MPT_ADAPTER *iocp,unsigned long arg); +static int mptctl_eventreport (MPT_ADAPTER *iocp,unsigned long arg); +static int mptctl_replace_fw (MPT_ADAPTER *iocp,unsigned long arg); + +static int mptctl_do_reset (MPT_ADAPTER *iocp,unsigned long arg); +static int mptctl_hp_hostinfo (MPT_ADAPTER *iocp,unsigned long arg,unsigned int cmd); +static int mptctl_hp_targetinfo (MPT_ADAPTER *iocp,unsigned long arg);static int mptctl_probe (struct pci_dev *,const struct pci_device_id *);static void mptctl_remove (struct pci_dev *);
@@ -123,8 +123,8 @@ static long compat_mpctl_ioctl(struct file *f, unsigned cmd, unsigned long arg);/* * Private function calls. */ -static int mptctl_do_mpt_command (struct mpt_ioctl_command karg,void __user *mfPtr); -static int mptctl_do_fw_download (int ioc,char __user *ufwbuf,size_t fwlen); +static int mptctl_do_mpt_command (MPT_ADAPTER *iocp,struct mpt_ioctl_command karg,void __user *mfPtr); +static int mptctl_do_fw_download (MPT_ADAPTER *iocp,char __user *ufwbuf,size_t fwlen);static MptSge_t *kbuf_alloc_2_sgl (int bytes,u32 dir,int sge_offset,int *frags,struct buflist **blp,dma_addr_t *sglbuf_dma,MPT_ADAPTER *ioc); static void kfree_sgl(MptSge_t *sgl, dma_addr_t sgl_dma,
@@ -656,19 +656,19 @@ __mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)* by TM and FW reloads. */ if ((cmd & ~IOCSIZE_MASK ) == (MPTIOCINFO & ~IOCSIZE_MASK )) { -return mptctl_getiocinfo (arg,_IOC_SIZE (cmd)); +return mptctl_getiocinfo (iocp, arg,_IOC_SIZE (cmd)); }else if (cmd ==MPTTARGETINFO ) { -return mptctl_gettargetinfo (arg); +return mptctl_gettargetinfo (iocp, arg); }else if (cmd ==MPTTEST ) { -return mptctl_readtest (arg); +return mptctl_readtest (iocp, arg); }else if (cmd ==MPTEVENTQUERY ) { -return mptctl_eventquery (arg); +return mptctl_eventquery (iocp, arg); }else if (cmd ==MPTEVENTENABLE ) { -return mptctl_eventenable (arg); +return mptctl_eventenable (iocp, arg); }else if (cmd ==MPTEVENTREPORT ) { -return mptctl_eventreport (arg); +return mptctl_eventreport (iocp, arg); }else if (cmd ==MPTFWREPLACE ) { -return mptctl_replace_fw (arg); +return mptctl_replace_fw (iocp, arg); }/* All of these commands require an interrupt or
@@ -678,15 +678,15 @@ __mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)return ret;if (cmd ==MPTFWDOWNLOAD ) - ret =mptctl_fw_download (arg); + ret =mptctl_fw_download (iocp, arg);else if (cmd ==MPTCOMMAND ) - ret =mptctl_mpt_command (arg); + ret =mptctl_mpt_command (iocp, arg);else if (cmd ==MPTHARDRESET ) - ret =mptctl_do_reset (arg); + ret =mptctl_do_reset (iocp, arg);else if ((cmd & ~IOCSIZE_MASK ) == (HP_GETHOSTINFO & ~IOCSIZE_MASK )) - ret =mptctl_hp_hostinfo (arg,_IOC_SIZE (cmd)); + ret =mptctl_hp_hostinfo (iocp, arg,_IOC_SIZE (cmd));else if (cmd ==HP_GETTARGETINFO ) - ret =mptctl_hp_targetinfo (arg); + ret =mptctl_hp_targetinfo (iocp, arg);else ret = -EINVAL ;
@@ -705,11 +705,10 @@ mptctl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)return ret; } -static int mptctl_do_reset (unsigned long arg) +static int mptctl_do_reset (MPT_ADAPTER *iocp,unsigned long arg) {struct mpt_ioctl_diag_reset __user *urinfo = (void __user *) arg;struct mpt_ioctl_diag_reset krinfo; -MPT_ADAPTER *iocp;if (copy_from_user (&krinfo, urinfo,sizeof (struct mpt_ioctl_diag_reset ))) { printk(KERN_ERR MYNAM "%s@%d::mptctl_do_reset - "
@@ -718,12 +717,6 @@ static int mptctl_do_reset(unsigned long arg)return -EFAULT ; } -if (mpt_verify_adapter (krinfo.hdr.iocnum, &iocp) <0 ) { - printk(KERN_DEBUG MYNAM "%s@%d::mptctl_do_reset - ioc%d not found!\n", - __FILE__, __LINE__, krinfo.hdr.iocnum); -return -ENODEV ;/* (-6) No such device or address */ - } -dctlprintk (iocp,printk (MYIOC_s_DEBUG_FMT"mptctl_do_reset called.\n" , iocp->name));
@@ -754,7 +747,7 @@ static int mptctl_do_reset(unsigned long arg)* -ENOMSG if FW upload returned bad status */ static int -mptctl_fw_download (unsigned long arg) +mptctl_fw_download (MPT_ADAPTER *iocp,unsigned long arg) {struct mpt_fw_xfer __user *ufwdl = (void __user *) arg;struct mpt_fw_xfer kfwdl;
@@ -766,7 +759,7 @@ mptctl_fw_download(unsigned long arg)return -EFAULT ; } -return mptctl_do_fw_download (kfwdl.iocnum, kfwdl.bufp, kfwdl.fwlen); +return mptctl_do_fw_download (iocp, kfwdl.bufp, kfwdl.fwlen); }/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -784,11 +777,10 @@ mptctl_fw_download(unsigned long arg)* -ENOMSG if FW upload returned bad status */ static int -mptctl_do_fw_download (int ioc,char __user *ufwbuf,size_t fwlen) +mptctl_do_fw_download (MPT_ADAPTER *iocp,char __user *ufwbuf,size_t fwlen) {FWDownload_t *dlmsg;MPT_FRAME_HDR *mf; -MPT_ADAPTER *iocp;FWDownloadTCSGE_t *ptsge;MptSge_t *sgl, *sgIn;char *sgOut;
@@ -808,17 +800,10 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen)pFWDownloadReply_t ReplyMsg =NULL ;unsigned long timeleft; -if (mpt_verify_adapter (ioc, &iocp) <0 ) { - printk(KERN_DEBUG MYNAM "ioctl_fwdl - ioc%d not found!\n", - ioc); -return -ENODEV ;/* (-6) No such device or address */ - }else { - -/* Valid device. Get a message frame and construct the FW download message. -*/ -if ((mf =mpt_get_msg_frame (mptctl_id, iocp)) ==NULL ) -return -EAGAIN ; - } +/* Valid device. Get a message frame and construct the FW download message. +*/ +if ((mf =mpt_get_msg_frame (mptctl_id, iocp)) ==NULL ) +return -EAGAIN ;dctlprintk (iocp,printk (MYIOC_s_DEBUG_FMT"mptctl_do_fwdl called. mptctl_id = %xh.\n" , iocp->name, mptctl_id));
@@ -826,8 +811,6 @@ mptctl_do_fw_download(int ioc, char __user *ufwbuf, size_t fwlen) iocp->name, ufwbuf));dctlprintk (iocp,printk (MYIOC_s_DEBUG_FMT"DbG: kfwdl.fwlen = %d\n" , iocp->name, (int )fwlen)); -dctlprintk (iocp,printk (MYIOC_s_DEBUG_FMT"DbG: kfwdl.ioc = %04xh\n" , - iocp->name, ioc)); dlmsg = (FWDownload_t *) mf; ptsge = (FWDownloadTCSGE_t *) &dlmsg->SGL;
@@ -1238,13 +1221,11 @@ kfree_sgl(MptSge_t *sgl, dma_addr_t sgl_dma, struct buflist *buflist, MPT_ADAPTE* -ENODEV if no such device/adapter */ static int -mptctl_getiocinfo (unsigned long arg,unsigned int data_size) +mptctl_getiocinfo (MPT_ADAPTER *ioc,unsigned long arg,unsigned int data_size) {struct mpt_ioctl_iocinfo __user *uarg = (void __user *) arg;struct mpt_ioctl_iocinfo *karg; -MPT_ADAPTER *ioc;struct pci_dev *pdev; -int iocnum;unsigned int port;int cim_rev;struct scsi_device *sdev;
@@ -1272,14 +1253,6 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)return PTR_ERR (karg); } -if (((iocnum =mpt_verify_adapter (karg->hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_getiocinfo() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -kfree (karg); -return -ENODEV ; - } -/* Verify the data transfer size is correct. */ if (karg->hdr.maxDataSize != data_size) { printk(MYIOC_s_ERR_FMT "%s@%d::mptctl_getiocinfo - "
@@ -1385,15 +1358,13 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)* -ENODEV if no such device/adapter */ static int -mptctl_gettargetinfo (unsigned long arg) +mptctl_gettargetinfo (MPT_ADAPTER *ioc,unsigned long arg) {struct mpt_ioctl_targetinfo __user *uarg = (void __user *) arg;struct mpt_ioctl_targetinfo karg; -MPT_ADAPTER *ioc;VirtDevice *vdevice;char *pmem;int *pdata; -int iocnum;int numDevices =0 ;int lun;int maxWordsLeft;
@@ -1408,13 +1379,6 @@ mptctl_gettargetinfo (unsigned long arg)return -EFAULT ; } -if (((iocnum =mpt_verify_adapter (karg.hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_gettargetinfo() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -return -ENODEV ; - } -dctlprintk (ioc,printk (MYIOC_s_DEBUG_FMT"mptctl_gettargetinfo called.\n" , ioc->name));/* Get the port number and set the maximum number of bytes
@@ -1510,12 +1474,10 @@ mptctl_gettargetinfo (unsigned long arg)* -ENODEV if no such device/adapter */ static int -mptctl_readtest (unsigned long arg) +mptctl_readtest (MPT_ADAPTER *ioc,unsigned long arg) {struct mpt_ioctl_test __user *uarg = (void __user *) arg;struct mpt_ioctl_test karg; -MPT_ADAPTER *ioc; -int iocnum;if (copy_from_user (&karg, uarg,sizeof (struct mpt_ioctl_test ))) { printk(KERN_ERR MYNAM "%s@%d::mptctl_readtest - "
@@ -1524,13 +1486,6 @@ mptctl_readtest (unsigned long arg)return -EFAULT ; } -if (((iocnum =mpt_verify_adapter (karg.hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_readtest() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -return -ENODEV ; - } -dctlprintk (ioc,printk (MYIOC_s_DEBUG_FMT"mptctl_readtest called.\n" , ioc->name));/* Fill in the data and return the structure to the calling
@@ -1571,12 +1526,10 @@ mptctl_readtest (unsigned long arg)* -ENODEV if no such device/adapter */ static int -mptctl_eventquery (unsigned long arg) +mptctl_eventquery (MPT_ADAPTER *ioc,unsigned long arg) {struct mpt_ioctl_eventquery __user *uarg = (void __user *) arg;struct mpt_ioctl_eventquery karg; -MPT_ADAPTER *ioc; -int iocnum;if (copy_from_user (&karg, uarg,sizeof (struct mpt_ioctl_eventquery ))) { printk(KERN_ERR MYNAM "%s@%d::mptctl_eventquery - "
@@ -1585,13 +1538,6 @@ mptctl_eventquery (unsigned long arg)return -EFAULT ; } -if (((iocnum =mpt_verify_adapter (karg.hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_eventquery() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -return -ENODEV ; - } -dctlprintk (ioc,printk (MYIOC_s_DEBUG_FMT"mptctl_eventquery called.\n" , ioc->name)); karg.eventEntries =MPTCTL_EVENT_LOG_SIZE ;
@@ -1610,12 +1556,10 @@ mptctl_eventquery (unsigned long arg)/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ static int -mptctl_eventenable (unsigned long arg) +mptctl_eventenable (MPT_ADAPTER *ioc,unsigned long arg) {struct mpt_ioctl_eventenable __user *uarg = (void __user *) arg;struct mpt_ioctl_eventenable karg; -MPT_ADAPTER *ioc; -int iocnum;if (copy_from_user (&karg, uarg,sizeof (struct mpt_ioctl_eventenable ))) { printk(KERN_ERR MYNAM "%s@%d::mptctl_eventenable - "
@@ -1624,13 +1568,6 @@ mptctl_eventenable (unsigned long arg)return -EFAULT ; } -if (((iocnum =mpt_verify_adapter (karg.hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_eventenable() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -return -ENODEV ; - } -dctlprintk (ioc,printk (MYIOC_s_DEBUG_FMT"mptctl_eventenable called.\n" , ioc->name));if (ioc->events ==NULL ) {
@@ -1658,12 +1595,10 @@ mptctl_eventenable (unsigned long arg)/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ static int -mptctl_eventreport (unsigned long arg) +mptctl_eventreport (MPT_ADAPTER *ioc,unsigned long arg) {struct mpt_ioctl_eventreport __user *uarg = (void __user *) arg;struct mpt_ioctl_eventreport karg; -MPT_ADAPTER *ioc; -int iocnum;int numBytes, maxEvents, max;if (copy_from_user (&karg, uarg,sizeof (struct mpt_ioctl_eventreport ))) {
@@ -1673,12 +1608,6 @@ mptctl_eventreport (unsigned long arg)return -EFAULT ; } -if (((iocnum =mpt_verify_adapter (karg.hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_eventreport() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -return -ENODEV ; - }dctlprintk (ioc,printk (MYIOC_s_DEBUG_FMT"mptctl_eventreport called.\n" , ioc->name));
@@ -1712,12 +1641,10 @@ mptctl_eventreport (unsigned long arg)/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ static int -mptctl_replace_fw (unsigned long arg) +mptctl_replace_fw (MPT_ADAPTER *ioc,unsigned long arg) {struct mpt_ioctl_replace_fw __user *uarg = (void __user *) arg;struct mpt_ioctl_replace_fw karg; -MPT_ADAPTER *ioc; -int iocnum;int newFwSize;if (copy_from_user (&karg, uarg,sizeof (struct mpt_ioctl_replace_fw ))) {
@@ -1727,13 +1654,6 @@ mptctl_replace_fw (unsigned long arg)return -EFAULT ; } -if (((iocnum =mpt_verify_adapter (karg.hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_replace_fw() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -return -ENODEV ; - } -dctlprintk (ioc,printk (MYIOC_s_DEBUG_FMT"mptctl_replace_fw called.\n" , ioc->name));/* If caching FW, Free the old FW image
@@ -1780,12 +1700,10 @@ mptctl_replace_fw (unsigned long arg)* -ENOMEM if memory allocation error */ static int -mptctl_mpt_command (unsigned long arg) +mptctl_mpt_command (MPT_ADAPTER *ioc,unsigned long arg) {struct mpt_ioctl_command __user *uarg = (void __user *) arg;struct mpt_ioctl_command karg; -MPT_ADAPTER *ioc; -int iocnum;int rc;
@@ -1796,14 +1714,7 @@ mptctl_mpt_command (unsigned long arg)return -EFAULT ; } -if (((iocnum =mpt_verify_adapter (karg.hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_mpt_command() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -return -ENODEV ; - } - - rc =mptctl_do_mpt_command (karg, &uarg->MF); + rc =mptctl_do_mpt_command (ioc, karg, &uarg->MF);return rc; }
@@ -1821,9 +1732,8 @@ mptctl_mpt_command (unsigned long arg)* -EPERM if SCSI I/O and target is untagged */ static int -mptctl_do_mpt_command (struct mpt_ioctl_command karg,void __user *mfPtr) +mptctl_do_mpt_command (MPT_ADAPTER *ioc,struct mpt_ioctl_command karg,void __user *mfPtr) { -MPT_ADAPTER *ioc;MPT_FRAME_HDR *mf =NULL ;MPIHeader_t *hdr;char *psge;
@@ -1832,7 +1742,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr)dma_addr_t dma_addr_in;dma_addr_t dma_addr_out;int sgSize =0 ;/* Num SG elements */ -int iocnum, flagsLength; +int flagsLength;int sz, rc =0 ;int msgContext;u16 req_idx;
@@ -1847,13 +1757,6 @@ mptctl_do_mpt_command (struct mpt_ioctl_command karg, void __user *mfPtr) bufIn.kptr = bufOut.kptr =NULL ; bufIn.len = bufOut.len =0 ; -if (((iocnum =mpt_verify_adapter (karg.hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_do_mpt_command() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -return -ENODEV ; - } -spin_lock_irqsave (&ioc->taskmgmt_lock, flags);if (ioc->ioc_reset_in_progress) {spin_unlock_irqrestore (&ioc->taskmgmt_lock, flags);
@@ -2418,17 +2321,15 @@ done_free_mem:* -ENOMEM if memory allocation error */ static int -mptctl_hp_hostinfo (unsigned long arg,unsigned int data_size) +mptctl_hp_hostinfo (MPT_ADAPTER *ioc,unsigned long arg,unsigned int data_size) {hp_host_info_t __user *uarg = (void __user *) arg; -MPT_ADAPTER *ioc;struct pci_dev *pdev;char *pbuf=NULL ;dma_addr_t buf_dma;hp_host_info_t karg;CONFIGPARMS cfg;ConfigPageHeader_t hdr; -int iocnum;int rc, cim_rev;ToolboxIstwiReadWriteRequest_t *IstwiRWRequest;MPT_FRAME_HDR *mf =NULL ;
@@ -2452,12 +2353,6 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)return -EFAULT ; } -if (((iocnum =mpt_verify_adapter (karg.hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_hp_hostinfo() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -return -ENODEV ; - }dctlprintk (ioc,printk (MYIOC_s_DEBUG_FMT": mptctl_hp_hostinfo called.\n" , ioc->name));
@@ -2670,15 +2565,13 @@ retry_wait:* -ENOMEM if memory allocation error */ static int -mptctl_hp_targetinfo (unsigned long arg) +mptctl_hp_targetinfo (MPT_ADAPTER *ioc,unsigned long arg) {hp_target_info_t __user *uarg = (void __user *) arg;SCSIDevicePage0_t *pg0_alloc;SCSIDevicePage3_t *pg3_alloc; -MPT_ADAPTER *ioc;MPT_SCSI_HOST *hd =NULL ;hp_target_info_t karg; -int iocnum;int data_sz;dma_addr_t page_dma;CONFIGPARMS cfg;
@@ -2692,12 +2585,6 @@ mptctl_hp_targetinfo(unsigned long arg)return -EFAULT ; } -if (((iocnum =mpt_verify_adapter (karg.hdr.iocnum, &ioc)) <0 ) || - (ioc ==NULL )) { - printk(KERN_DEBUG MYNAM "%s::mptctl_hp_targetinfo() @%d - ioc%d not found!\n", - __FILE__, __LINE__, iocnum); -return -ENODEV ; - }if (karg.hdr.id >=MPT_MAX_FC_DEVICES )return -EINVAL ; dctlprintk(ioc, printk(MYIOC_s_DEBUG_FMT "mptctl_hp_targetinfo called.\n",
@@ -2865,7 +2752,7 @@ compat_mptfwxfer_ioctl(struct file *filp, unsigned int cmd, kfw.fwlen = kfw32.fwlen; kfw.bufp =compat_ptr (kfw32.bufp); - ret =mptctl_do_fw_download (kfw.iocnum, kfw.bufp, kfw.fwlen); + ret =mptctl_do_fw_download (iocp, kfw.bufp, kfw.fwlen);mutex_unlock (&iocp->ioctl_cmds.mutex);
@@ -2919,7 +2806,7 @@ compat_mpt_command(struct file *filp, unsigned int cmd,/* Pass new structure to do_mpt_command */ - ret =mptctl_do_mpt_command (karg, &uarg->MF); + ret =mptctl_do_mpt_command (iocp, karg, &uarg->MF);mutex_unlock (&iocp->ioctl_cmds.mutex);
Signature · 1 line
2.20.1