* [PATCH AUTOSEL 5.10 2/7] bnx2x: fix page fault following EEH recovery
2023-08-29 13:33 [PATCH AUTOSEL 5.10 1/7] netlabel: fix shift wrapping bug in netlbl_catmap_setlong() Sasha Levin
@ 2023-08-29 13:33 ` Sasha Levin
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 3/7] smb/client: print "Unknown" instead of bogus link speed value Sasha Levin
` (4 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Sasha Levin @ 2023-08-29 13:33 UTC (permalink / raw)
To: linux-kernel, stable
Cc: David Christensen, Sridhar Samudrala, David S . Miller,
Sasha Levin, aelior, skalluru, manishc, edumazet, kuba, pabeni,
netdev
From: David Christensen <drc@linux.vnet.ibm.com>
[ 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.
Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Reviewed-by: Sridhar Samudrala <sridhar.samudrala@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index afb6d3ee1f564..c8cbf3ed128de 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -14372,11 +14372,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();
}
--
2.40.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH AUTOSEL 5.10 3/7] smb/client: print "Unknown" instead of bogus link speed value
2023-08-29 13:33 [PATCH AUTOSEL 5.10 1/7] netlabel: fix shift wrapping bug in netlbl_catmap_setlong() Sasha Levin
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 2/7] bnx2x: fix page fault following EEH recovery Sasha Levin
@ 2023-08-29 13:33 ` Sasha Levin
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 4/7] sctp: handle invalid error codes without calling BUG() Sasha Levin
` (3 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Sasha Levin @ 2023-08-29 13:33 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Enzo Matsumiya, Shyam Prasad N, Steve French, Sasha Levin, gregkh,
pc, linkinjeon
From: Enzo Matsumiya <ematsumiya@suse.de>
[ 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.
Signed-off-by: Enzo Matsumiya <ematsumiya@suse.de>
Reviewed-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/cifs/cifs_debug.c | 47 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 46 insertions(+), 1 deletion(-)
diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 53588d7517b4d..f14b2875b4cc3 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -12,6 +12,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"
@@ -142,18 +143,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);
--
2.40.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH AUTOSEL 5.10 4/7] sctp: handle invalid error codes without calling BUG()
2023-08-29 13:33 [PATCH AUTOSEL 5.10 1/7] netlabel: fix shift wrapping bug in netlbl_catmap_setlong() Sasha Levin
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 2/7] bnx2x: fix page fault following EEH recovery Sasha Levin
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 3/7] smb/client: print "Unknown" instead of bogus link speed value Sasha Levin
@ 2023-08-29 13:33 ` Sasha Levin
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 5/7] cifs: add a warning when the in-flight count goes negative Sasha Levin
` (2 subsequent siblings)
5 siblings, 0 replies; 10+ messages in thread
From: Sasha Levin @ 2023-08-29 13:33 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Dan Carpenter, David S . Miller, Sasha Levin, vyasevich, nhorman,
marcelo.leitner, edumazet, kuba, pabeni, linux-sctp, netdev
From: Dan Carpenter <dan.carpenter@linaro.org>
[ 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.
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/sctp/sm_sideeffect.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/sctp/sm_sideeffect.c b/net/sctp/sm_sideeffect.c
index d4e5969771f0f..30e9914526337 100644
--- a/net/sctp/sm_sideeffect.c
+++ b/net/sctp/sm_sideeffect.c
@@ -1241,7 +1241,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;
}
--
2.40.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH AUTOSEL 5.10 5/7] cifs: add a warning when the in-flight count goes negative
2023-08-29 13:33 [PATCH AUTOSEL 5.10 1/7] netlabel: fix shift wrapping bug in netlbl_catmap_setlong() Sasha Levin
` (2 preceding siblings ...)
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 4/7] sctp: handle invalid error codes without calling BUG() Sasha Levin
@ 2023-08-29 13:33 ` Sasha Levin
2023-08-29 13:47 ` Greg KH
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 6/7] scsi: storvsc: Always set no_report_opcodes Sasha Levin
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 7/7] ALSA: seq: oss: Fix racy open/close of MIDI devices Sasha Levin
5 siblings, 1 reply; 10+ messages in thread
From: Sasha Levin @ 2023-08-29 13:33 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Shyam Prasad N, Bharath SM, Steve French, Sasha Levin, pc, gregkh,
lsahlber, pc, vl, ematsumiya
From: Shyam Prasad N <sprasad@microsoft.com>
[ 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.
Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Reviewed-by: Bharath SM <bharathsm@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/cifs/smb2ops.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 015b7b37edee5..7ed6c2d4c549a 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -82,6 +82,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)
rc = change_conf(server);
--
2.40.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH AUTOSEL 5.10 5/7] cifs: add a warning when the in-flight count goes negative
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 5/7] cifs: add a warning when the in-flight count goes negative Sasha Levin
@ 2023-08-29 13:47 ` Greg KH
2023-09-04 0:35 ` Sasha Levin
0 siblings, 1 reply; 10+ messages in thread
From: Greg KH @ 2023-08-29 13:47 UTC (permalink / raw)
To: Sasha Levin
Cc: linux-kernel, stable, Shyam Prasad N, Bharath SM, Steve French,
pc, lsahlber, pc, vl, ematsumiya
On Tue, Aug 29, 2023 at 09:33:34AM -0400, Sasha Levin wrote:
> From: Shyam Prasad N <sprasad@microsoft.com>
>
> [ 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.
>
> Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
> Reviewed-by: Bharath SM <bharathsm@microsoft.com>
> Signed-off-by: Steve French <stfrench@microsoft.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
> fs/cifs/smb2ops.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
> index 015b7b37edee5..7ed6c2d4c549a 100644
> --- a/fs/cifs/smb2ops.c
> +++ b/fs/cifs/smb2ops.c
> @@ -82,6 +82,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)
> rc = change_conf(server);
> --
> 2.40.1
>
Please drop this from all queues, it's debugging code for the CIFS
developers, and they can debug it in Linus's tree, not in the stable
trees where something like this is going to cause systems to reboot.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH AUTOSEL 5.10 5/7] cifs: add a warning when the in-flight count goes negative
2023-08-29 13:47 ` Greg KH
@ 2023-09-04 0:35 ` Sasha Levin
0 siblings, 0 replies; 10+ messages in thread
From: Sasha Levin @ 2023-09-04 0:35 UTC (permalink / raw)
To: Greg KH
Cc: linux-kernel, stable, Shyam Prasad N, Bharath SM, Steve French,
pc, lsahlber, pc, vl, ematsumiya
On Tue, Aug 29, 2023 at 03:47:28PM +0200, Greg KH wrote:
>On Tue, Aug 29, 2023 at 09:33:34AM -0400, Sasha Levin wrote:
>> From: Shyam Prasad N <sprasad@microsoft.com>
>>
>> [ 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.
>>
>> Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
>> Reviewed-by: Bharath SM <bharathsm@microsoft.com>
>> Signed-off-by: Steve French <stfrench@microsoft.com>
>> Signed-off-by: Sasha Levin <sashal@kernel.org>
>> ---
>> fs/cifs/smb2ops.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
>> index 015b7b37edee5..7ed6c2d4c549a 100644
>> --- a/fs/cifs/smb2ops.c
>> +++ b/fs/cifs/smb2ops.c
>> @@ -82,6 +82,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)
>> rc = change_conf(server);
>> --
>> 2.40.1
>>
>
>Please drop this from all queues, it's debugging code for the CIFS
>developers, and they can debug it in Linus's tree, not in the stable
>trees where something like this is going to cause systems to reboot.
Dropped, thanks!
--
Thanks,
Sasha
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH AUTOSEL 5.10 6/7] scsi: storvsc: Always set no_report_opcodes
2023-08-29 13:33 [PATCH AUTOSEL 5.10 1/7] netlabel: fix shift wrapping bug in netlbl_catmap_setlong() Sasha Levin
` (3 preceding siblings ...)
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 5/7] cifs: add a warning when the in-flight count goes negative Sasha Levin
@ 2023-08-29 13:33 ` Sasha Levin
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 7/7] ALSA: seq: oss: Fix racy open/close of MIDI devices Sasha Levin
5 siblings, 0 replies; 10+ messages in thread
From: Sasha Levin @ 2023-08-29 13:33 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Michael Kelley, Martin K . Petersen, Sasha Levin, kys, haiyangz,
wei.liu, decui, jejb, linux-hyperv, linux-scsi
From: Michael Kelley <mikelley@microsoft.com>
[ 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.
Signed-off-by: Michael Kelley <mikelley@microsoft.com>
Link: https://lore.kernel.org/r/1686343101-18930-1-git-send-email-mikelley@microsoft.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/scsi/storvsc_drv.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 70b4868fe2f7d..17efb6c9e21f4 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1537,6 +1537,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;
/*
--
2.40.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH AUTOSEL 5.10 7/7] ALSA: seq: oss: Fix racy open/close of MIDI devices
2023-08-29 13:33 [PATCH AUTOSEL 5.10 1/7] netlabel: fix shift wrapping bug in netlbl_catmap_setlong() Sasha Levin
` (4 preceding siblings ...)
2023-08-29 13:33 ` [PATCH AUTOSEL 5.10 6/7] scsi: storvsc: Always set no_report_opcodes Sasha Levin
@ 2023-08-29 13:33 ` Sasha Levin
5 siblings, 0 replies; 10+ messages in thread
From: Sasha Levin @ 2023-08-29 13:33 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Takashi Iwai, Gong, Sishuai, Sasha Levin, perex, tiwai,
alsa-devel
From: Takashi Iwai <tiwai@suse.de>
[ 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.
Reported-by: "Gong, Sishuai" <sishuai@purdue.edu>
Closes: https://lore.kernel.org/r/7DC9AF71-F481-4ABA-955F-76C535661E33@purdue.edu
Link: https://lore.kernel.org/r/20230612125533.27461-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
sound/core/seq/oss/seq_oss_midi.c | 35 +++++++++++++++++++------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/sound/core/seq/oss/seq_oss_midi.c b/sound/core/seq/oss/seq_oss_midi.c
index f73ee0798aeab..be80ce72e0c72 100644
--- a/sound/core/seq/oss/seq_oss_midi.c
+++ b/sound/core/seq/oss/seq_oss_midi.c
@@ -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;
};
@@ -171,6 +172,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 */
strlcpy(mdev->name, pinfo->name, sizeof(mdev->name));
@@ -319,14 +321,16 @@ 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;
if ((mdev = get_mididev(dp, dev)) == NULL)
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;
@@ -336,14 +340,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;
@@ -368,13 +372,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;
}
/*
@@ -388,10 +396,9 @@ snd_seq_oss_midi_close(struct seq_oss_devinfo *dp, int dev)
if ((mdev = get_mididev(dp, dev)) == NULL)
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) {
@@ -410,6 +417,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;
}
--
2.40.1
^ permalink raw reply related [flat|nested] 10+ messages in thread