netlabel: fix shift wrapping bug in netlbl_catmap_setlong()
Subsystems (8)
Sasha Levin
maintainerPATCH 1/9 netlabel: fix shift wrapping bug in netlbl_catmap_setlong()
From: Dmitry Mastykin <[email protected]>
[ Upstream commit b403643d154d15176b060b82f7fc605210033edd ]
There is a shift wrapping bug in this code on 32-bit architectures. NETLBL_CATMAP_MAPTYPE is u64, bitmap is unsigned long. Every second 32-bit word of catmap becomes corrupted.
--- net/netlabel/netlabel_kapi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/netlabel/netlabel_kapi.c +2 -1
@@ -857,7 +857,8 @@ int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap, offset -= iter->startbit; idx = offset /NETLBL_CATMAP_MAPSIZE ; - iter->bitmap[idx] |= bitmap << (offset %NETLBL_CATMAP_MAPSIZE ); + iter->bitmap[idx] |= (NETLBL_CATMAP_MAPTYPE )bitmap + << (offset %NETLBL_CATMAP_MAPSIZE );return 0 ; }
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 2/9 bnx2x: fix page fault following EEH recovery
From: David Christensen <[email protected]>
[ Upstream commit 7ebe4eda4265642859507d1b3ca330d8c196cfe5 ]
In the last step of the EEH recovery process, the EEH driver calls into bnx2x_io_resume() to re-initialize the NIC hardware via the function bnx2x_nic_load(). If an error occurs during bnx2x_nic_load(), OS and hardware resources are released and an error code is returned to the caller. When called from bnx2x_io_resume(), the return code is ignored and the network interface is brought up unconditionally. Later attempts to send a packet via this interface result in a page fault due to a null pointer reference.
This patch checks the return code of bnx2x_nic_load(), prints an error message if necessary, and does not enable the interface.
--- drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +7 -2
@@ -14317,11 +14317,16 @@ static void bnx2x_io_resume(struct pci_dev *pdev) bp->fw_seq =SHMEM_RD (bp, func_mb[BP_FW_MB_IDX (bp)].drv_mb_header) &DRV_MSG_SEQ_NUMBER_MASK ; -if (netif_running (dev)) -bnx2x_nic_load (bp,LOAD_NORMAL ); +if (netif_running (dev)) { +if (bnx2x_nic_load (bp,LOAD_NORMAL )) { +netdev_err (bp->dev,"Error during driver initialization, try unloading/reloading the driver\n" ); + goto done; + } + }netif_device_attach (dev); +done:rtnl_unlock (); }
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 3/9 smb/client: print "Unknown" instead of bogus link speed value
In reply to Sasha LevinFrom: Enzo Matsumiya <[email protected]>
[ Upstream commit 50e63d6db6fd30a6dd9a33c49aa5b0bba36e1a92 ]
The virtio driver for Linux guests will not set a link speed to its paravirtualized NICs. This will be seen as -1 in the ethernet layer, and when some servers (e.g. samba) fetches it, it's converted to an unsigned value (and multiplied by 1000 * 1000), so in client side we end up with:
1) Speed: 4294967295000000 bps
in DebugData.
This patch introduces a helper that returns a speed string (in Mbps or Gbps) if interface speed is valid (>= SPEED_10 and <= SPEED_800000), or "Unknown" otherwise.
The reason to not change the value in iface->speed is because we don't know the real speed of the HW backing the server NIC, so let's keep considering these as the fastest NICs available.
Also print "Capabilities: None" when the interface doesn't support any.
--- fs/cifs/cifs_debug.c | 47 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-)
fs/cifs/cifs_debug.c +46 -1
@@ -11,6 +11,7 @@#include <linux/module.h> #include <linux/proc_fs.h> #include <linux/uaccess.h> +#include <uapi/linux/ethtool.h> #include "cifspdu.h" #include "cifsglob.h" #include "cifsproto.h"
@@ -144,18 +145,62 @@ cifs_dump_channel(struct seq_file *m, int i, struct cifs_chan *chan) atomic_read(&server->num_waiters)); } +static inline const char *smb_speed_to_str (size_t bps) +{ +size_t mbps = bps /1000 /1000 ; + +switch (mbps) { +case SPEED_10 : +return "10Mbps" ; +case SPEED_100 : +return "100Mbps" ; +case SPEED_1000 : +return "1Gbps" ; +case SPEED_2500 : +return "2.5Gbps" ; +case SPEED_5000 : +return "5Gbps" ; +case SPEED_10000 : +return "10Gbps" ; +case SPEED_14000 : +return "14Gbps" ; +case SPEED_20000 : +return "20Gbps" ; +case SPEED_25000 : +return "25Gbps" ; +case SPEED_40000 : +return "40Gbps" ; +case SPEED_50000 : +return "50Gbps" ; +case SPEED_56000 : +return "56Gbps" ; +case SPEED_100000 : +return "100Gbps" ; +case SPEED_200000 : +return "200Gbps" ; +case SPEED_400000 : +return "400Gbps" ; +case SPEED_800000 : +return "800Gbps" ; +default : +return "Unknown" ; + } +} +static void cifs_dump_iface (struct seq_file *m,struct cifs_server_iface *iface) {struct sockaddr_in *ipv4 = (struct sockaddr_in *)&iface->sockaddr;struct sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)&iface->sockaddr; -seq_printf (m,"\tSpeed: %zu bps\n" , iface->speed); +seq_printf (m,"\tSpeed: %s\n" ,smb_speed_to_str (iface->speed));seq_puts (m,"\t\tCapabilities: " );if (iface->rdma_capable)seq_puts (m,"rdma " );if (iface->rss_capable)seq_puts (m,"rss " ); +if (!iface->rdma_capable && !iface->rss_capable) +seq_puts (m,"None" );seq_putc (m,'\n' );if (iface->sockaddr.ss_family ==AF_INET )seq_printf (m,"\t\tIPv4: %pI4\n" , &ipv4->sin_addr);
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 4/9 sctp: handle invalid error codes without calling BUG()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit a0067dfcd9418fd3b0632bc59210d120d038a9c6 ]
The sctp_sf_eat_auth() function is supposed to return enum sctp_disposition values but if the call to sctp_ulpevent_make_authkey() fails, it returns -ENOMEM.
This results in calling BUG() inside the sctp_side_effects() function. Calling BUG() is an over reaction and not helpful. Call WARN_ON_ONCE() instead.
This code predates git.
--- net/sctp/sm_sideeffect.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/sctp/sm_sideeffect.c +4 -1
@@ -1251,7 +1251,10 @@ static int sctp_side_effects(enum sctp_event_type event_type,default :pr_err ("impossible disposition %d in state %d, event_type %d, event_id %d\n" , status, state, event_type, subtype.chunk); -BUG (); + error = status; +if (error >=0 ) + error = -EINVAL ; +WARN_ON_ONCE (1 );break ; }
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 5/9 cifs: add a warning when the in-flight count goes negative
In reply to Sasha LevinFrom: Shyam Prasad N <[email protected]>
[ Upstream commit e4645cc2f1e2d6f268bb8dcfac40997c52432aed ]
We've seen the in-flight count go into negative with some internal stress testing in Microsoft.
Adding a WARN when this happens, in hope of understanding why this happens when it happens.
--- fs/cifs/smb2ops.c | 1 + 1 file changed, 1 insertion(+)
fs/cifs/smb2ops.c +1 -0
@@ -85,6 +85,7 @@ smb2_add_credits(struct TCP_Server_Info *server, *val =65000 ;/* Don't get near 64K credits, avoid srv bugs */ pr_warn_once ("server overflowed SMB3 credits\n" ); } +WARN_ON_ONCE (server->in_flight ==0 ); server->in_flight--; if (server->in_flight == 0 && ((optype & CIFS_OP_MASK) != CIFS_NEG_OP) &&
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 6/9 scsi: aacraid: Reply queue mapping to CPUs based on IRQ affinity
In reply to Sasha LevinFrom: Sagar Biradar <[email protected]>
[ Upstream commit 9dc704dcc09eae7d21b5da0615eb2ed79278f63e ]
Fix the I/O hang that arises because of the MSIx vector not having a mapped online CPU upon receiving completion.
SCSI cmds take the blk_mq route, which is setup during init. Reserved cmds fetch the vector_no from mq_map after init is complete. Before init, they have to use 0 - as per the norm.
--- drivers/scsi/aacraid/aacraid.h | 1 + drivers/scsi/aacraid/commsup.c | 6 +++++- drivers/scsi/aacraid/linit.c | 14 ++++++++++++++ drivers/scsi/aacraid/src.c | 25 +++++++++++++++++++++++-- 4 files changed, 43 insertions(+), 3 deletions(-)
drivers/scsi/aacraid/aacraid.h +1 -0
@@ -1677,6 +1677,7 @@ struct aac_devu32 handle_pci_error;bool init_reset;u8 soft_reset_support; +u8 use_map_queue; };#define aac_adapter_interrupt (dev) \
drivers/scsi/aacraid/commsup.c +5 -1
@@ -223,8 +223,12 @@ int aac_fib_setup(struct aac_dev * dev)struct fib *aac_fib_alloc_tag (struct aac_dev *dev,struct scsi_cmnd *scmd) {struct fib *fibptr; +u32 blk_tag; +int i; - fibptr = &dev->fibs[scsi_cmd_to_rq (scmd)->tag]; + blk_tag =blk_mq_unique_tag (scsi_cmd_to_rq (scmd)); + i =blk_mq_unique_tag_to_tag (blk_tag); + fibptr = &dev->fibs[i];/* * Null out fields that depend on being zero at the start of * each I/O
drivers/scsi/aacraid/linit.c +14 -0
@@ -19,6 +19,7 @@#include <linux/compat.h> #include <linux/blkdev.h> +#include <linux/blk-mq-pci.h> #include <linux/completion.h> #include <linux/init.h> #include <linux/interrupt.h>
@@ -506,6 +507,15 @@ static int aac_slave_configure(struct scsi_device *sdev)return 0 ; } +static void aac_map_queues (struct Scsi_Host *shost) +{ +struct aac_dev *aac = (struct aac_dev *)shost->hostdata; + +blk_mq_pci_map_queues (&shost->tag_set.map[HCTX_TYPE_DEFAULT ], + aac->pdev,0 ); + aac->use_map_queue = true; +} +/** * aac_change_queue_depth - alter queue depths * @sdev: SCSI device we are considering
@@ -1485,6 +1495,7 @@ static struct scsi_host_template aac_driver_template = { .bios_param = aac_biosparm, .shost_attrs = aac_attrs, .slave_configure = aac_slave_configure, + .map_queues = aac_map_queues, .change_queue_depth = aac_change_queue_depth, .sdev_attrs = aac_dev_attrs, .eh_abort_handler = aac_eh_abort,
@@ -1771,6 +1782,8 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) shost->max_lun =AAC_MAX_LUN ;pci_set_drvdata (pdev, shost); + shost->nr_hw_queues = aac->max_msix; + shost->host_tagset =1 ; error =scsi_add_host (shost, &pdev->dev);if (error)
@@ -1903,6 +1916,7 @@ static void aac_remove_one(struct pci_dev *pdev)struct aac_dev *aac = (struct aac_dev *)shost->hostdata;aac_cancel_rescan_worker (aac); + aac->use_map_queue = false;scsi_remove_host (shost);__aac_shutdown (aac);
drivers/scsi/aacraid/src.c +23 -2
@@ -493,6 +493,10 @@ static int aac_src_deliver_message(struct fib *fib)#endif u16 vector_no; +struct scsi_cmnd *scmd; +u32 blk_tag; +struct Scsi_Host *shost = dev->scsi_host_ptr; +struct blk_mq_queue_map *qmap;atomic_inc (&q->numpending);
@@ -505,8 +509,25 @@ static int aac_src_deliver_message(struct fib *fib)if ((dev->comm_interface ==AAC_COMM_MESSAGE_TYPE3 ) && dev->sa_firmware) vector_no =aac_get_vector (dev); -else - vector_no = fib->vector_no; +else { +if (!fib->vector_no || !fib->callback_data) { +if (shost && dev->use_map_queue) { + qmap = &shost->tag_set.map[HCTX_TYPE_DEFAULT ]; + vector_no = qmap->mq_map[raw_smp_processor_id ()]; + } +/* +* We hardcode the vector_no for +* reserved commands as a valid shost is +* absent during the init +*/ +else + vector_no =0 ; + }else { + scmd = (struct scsi_cmnd *)fib->callback_data; + blk_tag =blk_mq_unique_tag (scsi_cmd_to_rq (scmd)); + vector_no =blk_mq_unique_tag_to_hwq (blk_tag); + } + }if (native_hba) {if (fib->flags &FIB_CONTEXT_FLAG_NATIVE_HBA_TMF ) {
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 7/9 scsi: storvsc: Always set no_report_opcodes
In reply to Sasha LevinFrom: Michael Kelley <[email protected]>
[ Upstream commit 31d16e712bdcaee769de4780f72ff8d6cd3f0589 ]
Hyper-V synthetic SCSI devices do not support the MAINTENANCE_IN SCSI command, so scsi_report_opcode() always fails, resulting in messages like this:
hv_storvsc <guid>: tag#205 cmd 0xa3 status: scsi 0x2 srb 0x86 hv 0xc0000001
The recently added support for command duration limits calls scsi_report_opcode() four times as each device comes online, which significantly increases the number of messages logged in a system with many disks.
Fix the problem by always marking Hyper-V synthetic SCSI devices as not supporting scsi_report_opcode(). With this setting, the MAINTENANCE_IN SCSI command is not issued and no messages are logged.
--- drivers/scsi/storvsc_drv.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/storvsc_drv.c +2 -0
@@ -1626,6 +1626,8 @@ static int storvsc_device_configure(struct scsi_device *sdevice) {blk_queue_rq_timeout (sdevice->request_queue, (storvsc_timeout *HZ )); +/* storvsc devices don't support MAINTENANCE_IN SCSI cmd */ + sdevice->no_report_opcodes =1 ; sdevice->no_write_same =1 ;/*
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 8/9 scsi: lpfc: Fix incorrect big endian type assignment in bsg loopback path
In reply to Sasha LevinFrom: Justin Tee <[email protected]>
[ Upstream commit 9cefd6e7e0a77b0fbca5c793f6fb6821b0962775 ]
The kernel test robot reported sparse warnings regarding incorrect type assignment for __be16 variables in bsg loopback path.
Change the flagged lines to use the be16_to_cpu() and cpu_to_be16() macros appropriately.
--- drivers/scsi/lpfc/lpfc_bsg.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/lpfc/lpfc_bsg.c +4 -4
@@ -911,7 +911,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, struct lpfc_iocbq *piocbq) {uint32_t evt_req_id =0 ; -uint32_t cmd; +u16 cmd;struct lpfc_dmabuf *dmabuf =NULL ;struct lpfc_bsg_event *evt;struct event_data *evt_dat =NULL ;
@@ -936,7 +936,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, ct_req = (struct lpfc_sli_ct_request *)bdeBuf1->virt; evt_req_id = ct_req->FsType; - cmd = ct_req->CommandResponse.bits.CmdRsp; + cmd =be16_to_cpu (ct_req->CommandResponse.bits.CmdRsp);spin_lock_irqsave (&phba->ct_ev_lock, flags);list_for_each_entry (evt, &phba->ct_ev_waiters, node) {
@@ -3243,8 +3243,8 @@ lpfc_bsg_diag_loopback_run(struct bsg_job *job) ctreq->RevisionId.bits.InId =0 ; ctreq->FsType =SLI_CT_ELX_LOOPBACK ; ctreq->FsSubType =0 ; - ctreq->CommandResponse.bits.CmdRsp =ELX_LOOPBACK_DATA ; - ctreq->CommandResponse.bits.Size = size; + ctreq->CommandResponse.bits.CmdRsp =cpu_to_be16 (ELX_LOOPBACK_DATA ); + ctreq->CommandResponse.bits.Size =cpu_to_be16 (size); segment_offset =ELX_LOOPBACK_HEADER_SZ ; }else segment_offset =0 ;
Signature · 1 line
2.40.1
Sasha Levin
maintainerPATCH 9/9 ALSA: seq: oss: Fix racy open/close of MIDI devices
In reply to Sasha LevinFrom: Takashi Iwai <[email protected]>
[ Upstream commit 297224fc0922e7385573a30c29ffdabb67f27b7d ]
Although snd_seq_oss_midi_open() and snd_seq_oss_midi_close() can be called concurrently from different code paths, we have no proper data protection against races. Introduce open_mutex to each seq_oss_midi object for avoiding the races.
--- sound/core/seq/oss/seq_oss_midi.c | 35 +++++++++++++++++++------------ 1 file changed, 22 insertions(+), 13 deletions(-)
sound/core/seq/oss/seq_oss_midi.c +22 -13
@@ -37,6 +37,7 @@ struct seq_oss_midi {struct snd_midi_event *coder;/* MIDI event coder */ struct seq_oss_devinfo *devinfo;/* assigned OSSseq device */ snd_use_lock_t use_lock; +struct mutex open_mutex; };
@@ -172,6 +173,7 @@ snd_seq_oss_midi_check_new_port(struct snd_seq_port_info *pinfo) mdev->flags = pinfo->capability; mdev->opened =0 ;snd_use_lock_init (&mdev->use_lock); +mutex_init (&mdev->open_mutex);/* copy and truncate the name of synth device */ strscpy (mdev->name, pinfo->name,sizeof (mdev->name));
@@ -322,15 +324,17 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode)int perm;struct seq_oss_midi *mdev;struct snd_seq_port_subscribe subs; +int err; mdev =get_mididev (dp, dev);if (!mdev)return -ENODEV ; +mutex_lock (&mdev->open_mutex);/* already used? */ if (mdev->opened && mdev->devinfo != dp) { -snd_use_lock_free (&mdev->use_lock); -return -EBUSY ; + err = -EBUSY ; + goto unlock; } perm =0 ;
@@ -340,14 +344,14 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode) perm |=PERM_READ ; perm &= mdev->flags;if (perm ==0 ) { -snd_use_lock_free (&mdev->use_lock); -return -ENXIO ; + err = -ENXIO ; + goto unlock; }/* already opened? */ if ((mdev->opened & perm) == perm) { -snd_use_lock_free (&mdev->use_lock); -return 0 ; + err =0 ; + goto unlock; } perm &= ~mdev->opened;
@@ -372,13 +376,17 @@ snd_seq_oss_midi_open(struct seq_oss_devinfo *dp, int dev, int fmode) }if (! mdev->opened) { -snd_use_lock_free (&mdev->use_lock); -return -ENXIO ; + err = -ENXIO ; + goto unlock; } mdev->devinfo = dp; + err =0 ; + + unlock: +mutex_unlock (&mdev->open_mutex);snd_use_lock_free (&mdev->use_lock); -return 0 ; +return err; }/*
@@ -393,10 +401,9 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev) mdev =get_mididev (dp, dev);if (!mdev)return -ENODEV ; -if (! mdev->opened || mdev->devinfo != dp) { -snd_use_lock_free (&mdev->use_lock); -return 0 ; - } +mutex_lock (&mdev->open_mutex); +if (!mdev->opened || mdev->devinfo != dp) + goto unlock;memset (&subs,0 ,sizeof (subs));if (mdev->opened &PERM_WRITE ) {
@@ -415,6 +422,8 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev) mdev->opened =0 ; mdev->devinfo =NULL ; + unlock: +mutex_unlock (&mdev->open_mutex);snd_use_lock_free (&mdev->use_lock);return 0 ; }
Signature · 1 line
2.40.1