scsi: target: iscsi: Prevent login threads from racing between each other
Subsystems (8)
Sasha Levin
maintainerPATCH 1/6 scsi: target: iscsi: Prevent login threads from racing between each other
From: Maurizio Lombardi <[email protected]>
[ Upstream commit 2a737d3b8c792400118d6cf94958f559de9c5e59 ]
The tpg->np_login_sem is a semaphore that is used to serialize the login process when multiple login threads run concurrently against the same target portal group.
The iscsi_target_locate_portal() function finds the tpg, calls iscsit_access_np() against the np_login_sem semaphore and saves the tpg pointer in conn->tpg;
If iscsi_target_locate_portal() fails, the caller will check for the conn->tpg pointer and, if it's not NULL, then it will assume that iscsi_target_locate_portal() called iscsit_access_np() on the semaphore.
Make sure that conn->tpg gets initialized only if iscsit_access_np() was successful, otherwise iscsit_deaccess_np() may end up being called against a semaphore we never took, allowing more than one thread to access the same tpg.
--- drivers/target/iscsi/iscsi_target_nego.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/target/iscsi/iscsi_target_nego.c +3 -1
@@ -1067,6 +1067,7 @@ int iscsi_target_locate_portal(iscsi_target_set_sock_callbacks (conn); login->np = np; + conn->tpg =NULL ; login_req = (struct iscsi_login_req *) login->req; payload_length =ntoh24 (login_req->dlength);
@@ -1136,7 +1137,6 @@ int iscsi_target_locate_portal(*/ sessiontype =strncmp (s_buf,DISCOVERY ,9 );if (!sessiontype) { - conn->tpg = iscsit_global->discovery_tpg;if (!login->leading_connection) goto get_target;
@@ -1153,9 +1153,11 @@ int iscsi_target_locate_portal(* Serialize access across the discovery struct iscsi_portal_group to * process login attempt. */ + conn->tpg = iscsit_global->discovery_tpg;if (iscsit_access_np (np, conn->tpg) <0 ) {iscsit_tx_login_rsp (conn,ISCSI_STATUS_CLS_TARGET_ERR ,ISCSI_LOGIN_STATUS_SVC_UNAVAILABLE ); + conn->tpg =NULL ; ret =-1 ; goto out; }
Signature · 1 line
2.39.2
Sasha Levin
maintainerPATCH 2/6 HID: wacom: Add error check to wacom_parse_and_register()
From: Denis Arefev <[email protected]>
[ Upstream commit 16a9c24f24fbe4564284eb575b18cc20586b9270 ]
Added a variable check and
transition in case of an error
Found by Linux Verification Center (linuxtesting.org) with SVACE.
--- drivers/hid/wacom_sys.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/hid/wacom_sys.c +6 -1
@@ -2251,8 +2251,13 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless) goto fail_quirks; } -if (features->device_type &WACOM_DEVICETYPE_WL_MONITOR ) +if (features->device_type &WACOM_DEVICETYPE_WL_MONITOR ) { error =hid_hw_open (hdev); +if (error) { +hid_err (hdev,"hw open failed\n" ); + goto fail_quirks; + } + }wacom_set_shared_values (wacom_wac);devres_close_group (&hdev->dev, wacom);
Signature · 1 line
2.39.2
Sasha Levin
maintainerPATCH 3/6 arm64: Add missing Set/Way CMO encodings
In reply to Sasha LevinFrom: Marc Zyngier <[email protected]>
[ Upstream commit 8d0f019e4c4f2ee2de81efd9bf1c27e9fb3c0460 ]
Add the missing Set/Way CMOs that apply to tagged memory.
--- arch/arm64/include/asm/sysreg.h | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm64/include/asm/sysreg.h +6 -0
@@ -98,8 +98,14 @@ (!!x)<<8 | 0x1f)#define SYS_DC_ISW sys_insn(1, 0, 7, 6, 2) +#define SYS_DC_IGSW sys_insn(1, 0, 7, 6, 4) +#define SYS_DC_IGDSW sys_insn(1, 0, 7, 6, 6)#define SYS_DC_CSW sys_insn(1, 0, 7, 10, 2) +#define SYS_DC_CGSW sys_insn(1, 0, 7, 10, 4) +#define SYS_DC_CGDSW sys_insn(1, 0, 7, 10, 6)#define SYS_DC_CISW sys_insn(1, 0, 7, 14, 2) +#define SYS_DC_CIGSW sys_insn(1, 0, 7, 14, 4) +#define SYS_DC_CIGDSW sys_insn(1, 0, 7, 14, 6)#define SYS_OSDTRRX_EL1 sys_reg(2, 0, 0, 0, 2)#define SYS_MDCCINT_EL1 sys_reg(2, 0, 0, 2, 0)
Signature · 7 lines
2.39.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH AUTOSEL 4.14 3/6] arm64: Add missing Set/Way CMO encodings
Hi!
Quoted 5 lines
From: Marc Zyngier <[email protected]>
[ Upstream commit
8d0f019e4c4f2ee2de81efd9bf1c27e9fb3c0460]Add the missing Set/Way CMOs that apply to tagged memory.
We are not adding users of these in 4.14, so we don't need the defines, either... right?
Best regards,
Pavel
Quoted 16 lines
+++
b/arch/arm64/include/asm/sysreg.harch/arm64/include/asm/sysreg.h +6
-0@@ -98,8 +98,14 @@ (!!x)<<8 | 0x1f)#define SYS_DC_ISW sys_insn(1, 0, 7, 6, 2) +#define SYS_DC_IGSW sys_insn(1, 0, 7, 6, 4) +#define SYS_DC_IGDSW sys_insn(1, 0, 7, 6, 6)#define SYS_DC_CSW sys_insn(1, 0, 7, 10, 2) +#define SYS_DC_CGSW sys_insn(1, 0, 7, 10, 4) +#define SYS_DC_CGDSW sys_insn(1, 0, 7, 10, 6)#define SYS_DC_CISW sys_insn(1, 0, 7, 14, 2) +#define SYS_DC_CIGSW sys_insn(1, 0, 7, 14, 4) +#define SYS_DC_CIGDSW sys_insn(1, 0, 7, 14, 6)#define SYS_OSDTRRX_EL1 sys_reg(2, 0, 0, 0, 2)#define SYS_MDCCINT_EL1 sys_reg(2, 0, 0, 2, 0)
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Sasha Levin
maintainerPATCH 4/6 nfcsim.c: Fix error checking for debugfs_create_dir
In reply to Sasha LevinFrom: Osama Muhammad <[email protected]>
[ Upstream commit 9b9e46aa07273ceb96866b2e812b46f1ee0b8d2f ]
This patch fixes the error checking in nfcsim.c. The DebugFS kernel API is developed in
a way that the caller can safely ignore the errors that occur during the creation of DebugFS nodes.
--- drivers/nfc/nfcsim.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/nfc/nfcsim.c +0 -4
@@ -345,10 +345,6 @@ static struct dentry *nfcsim_debugfs_root;static void nfcsim_debugfs_init (void ) { nfcsim_debugfs_root =debugfs_create_dir ("nfcsim" ,NULL ); - -if (!nfcsim_debugfs_root) -pr_err ("Could not create debugfs entry\n" ); - }static void nfcsim_debugfs_remove (void )
Signature · 1 line
2.39.2
Re: [PATCH AUTOSEL 4.14 4/6] nfcsim.c: Fix error checking for debugfs_create_dir
Hi!
Quoted 6 lines
[ Upstream commit
9b9e46aa07273ceb96866b2e812b46f1ee0b8d2f]This patch fixes the error checking in
nfcsim.c. The DebugFS kernel API is developed in
a way that the caller can safely ignore the errors that occur during the creation of DebugFS nodes.
I don't think this is good idea; user will wonder why he can't see debugfs files, and pr_err() is quite suitable way to handle this.
Anyway, this does not really fix a bug, so we should not be putting it into stable.
Best regards,
Pavel
Quoted 18 lines
drivers/nfc/nfcsim.c | 4 ---- 1 file changed, 4 deletions(-)drivers/nfc/nfcsim.c +0
-4@@ -345,10 +345,6 @@ static struct dentry *nfcsim_debugfs_root;static void nfcsim_debugfs_init (void ) { nfcsim_debugfs_root =debugfs_create_dir ("nfcsim" ,NULL ); - -if (!nfcsim_debugfs_root) -pr_err ("Could not create debugfs entry\n" ); - }static void nfcsim_debugfs_remove (void )
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Sasha Levin
maintainerPATCH 5/6 fbdev: imsttfb: Release framebuffer and dealloc cmap on error path
In reply to Sasha LevinFrom: Helge Deller <[email protected]>
[ Upstream commit 5cf9a090a39c97f4506b7b53739d469b1c05a7e9 ]
Add missing cleanups in error path.
--- drivers/video/fbdev/imsttfb.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/video/fbdev/imsttfb.c +5 -1
@@ -1452,9 +1452,13 @@ static void init_imstt(struct fb_info *info)FBINFO_HWACCEL_FILLRECT |FBINFO_HWACCEL_YPAN ; -fb_alloc_cmap (&info->cmap,0 ,0 ); +if (fb_alloc_cmap (&info->cmap,0 ,0 )) { +framebuffer_release (info); +return -ENODEV ; + }if (register_framebuffer (info) <0 ) { +fb_dealloc_cmap (&info->cmap);framebuffer_release (info);return ; }
Signature · 1 line
2.39.2
Re: [PATCH AUTOSEL 4.14 5/6] fbdev: imsttfb: Release framebuffer and dealloc cmap on error path
Hi!
Quoted 5 lines
From: Helge Deller <[email protected]>
[ Upstream commit
5cf9a090a39c97f4506b7b53739d469b1c05a7e9]Add missing cleanups in error path.
If we insist this is important enough for -stable, it will need tweaking. The function returns void, so we can't return a value.
Best regards,
Pavel
Quoted 16 lines
+++
b/drivers/video/fbdev/imsttfb.cdrivers/video/fbdev/imsttfb.c +5
-1@@ -1452,9 +1452,13 @@ static void init_imstt(struct fb_info *info)FBINFO_HWACCEL_FILLRECT |FBINFO_HWACCEL_YPAN ; -fb_alloc_cmap (&info->cmap,0 ,0 ); +if (fb_alloc_cmap (&info->cmap,0 ,0 )) { +framebuffer_release (info); +return -ENODEV ; + }if (register_framebuffer (info) <0 ) { +fb_dealloc_cmap (&info->cmap);framebuffer_release (info);return ; }
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Sasha Levin
maintainerPATCH 6/6 usb: gadget: udc: fix NULL dereference in remove()
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit 016da9c65fec9f0e78c4909ed9a0f2d567af6775 ]
The "udc" pointer was never set in the probe() function so it will lead to a NULL dereference in udc_pci_remove() when we do:
usb_del_gadget_udc(&udc->gadget);
--- drivers/usb/gadget/udc/amd5536udc_pci.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/usb/gadget/udc/amd5536udc_pci.c +3 -0
@@ -175,6 +175,9 @@ static int udc_pci_probe( retval = -ENODEV ; goto err_probe; } + + udc = dev; +return 0 ; err_probe:
Signature · 1 line
2.39.2