Skip to content

s390/sclp: Misc fixes

Alexander Egorenkov linux-s390 5 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v8 Latest5 patches 0 repliesNew
  2. v75 patches 1 replySuperseded
  3. v65 patches 0 repliesSuperseded
Earlier versions · 2
VersionPostedPatchesRepliesStatus
v54 patches4 repliesSuperseded
v22 patches0 repliesSuperseded

Changes in v8 from the cover letter

----------------
- Fixed checkpatch.pl complaints in patch #2 and #3 as pointed out by Christian

Patches in v8 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/5s390/sclp: Make parsing of received event buffers more robustdrivers/s390/char/sclp.c+14 -40 replies
2/5s390/sclp: Introduce macro sclp_gds_for_each()drivers/s390/char/sclp.h+16 -60 replies
3/5s390/sclp_tty: Make use of sclp_gds_for_each()drivers/s390/char/sclp_tty.c+9 -120 replies
4/5s390/sclp_ocf: Fix computation of length of GDS valuesdrivers/s390/char/sclp_ocf.c+2 -20 replies
5/5s390/sclp: Ensure no callback gets called after sclp_unregister() returnsdrivers/s390/char/sclp.c+19 -60 replies

Reviews trailers per patch

2 of 5 patches have a Reviewed-by or Acked-by.

PatchPeter Oberparleiter
1/5
2/5
3/5
4/5R-b
5/5R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v8 thread

Cover letter [PATCH v8 0/5] s390/sclp: Misc fixes

This series consists of several fixes for the s390 SCLP driver.

* The first patch makes sclp_dispatch_evbufs() more safe while parsing event buffers contained in a received SCCB buffer.
* The second patch introduces the macro sclp_gds_for_each() to safely iterate over GDS {sub}vectors and serves to improve error handling in sclp_find_gds_{sub}vector() to prevent out-of-range memory read and potential infinite loops
when a malformed event buffer is received from SCLP.
* The third patch reuses the macro sclp_gds_for_each() in SCLP TTY introduced in the first patch to replace manual and error-prone iteration over entries of a GDS {sub}vector to fix the same issues addressed in the first patch.
* The fourth patch fixes 2 potential illegal memory accesses when reading
the value from a GDS subvector in SCLP event buffers sent by OCF.
* The fifth patch fixes race situations with in-flight callbacks and sclp_unregister() calls.

Changes since v7
----------------
- Fixed checkpatch.pl complaints in patch #2 and #3 as pointed out by Christian

Changes since v6
----------------
- Rework the patch "s390/sclp: Make parsing of received event buffers more robust"
- Move event buffer header checks into the parsing loop to make code more readable as suggested by Peter
- Add check for SCCB buffer length as suggested by Peter
- Return with -EINVAL from sclp_dispatch_evbufs() if SCCB or event buffer checks fail
- Improved commit message

Changes since v5
----------------
- Added patch "s390/sclp: Make parsing of received event buffers more robust"
- Reported by Sashiko
- Rework the patch "s390/sclp: Introduce macro sclp_gds_for_each()"
- Explicit cast of start and end parameters to void* removing the need for the caller to use extra void* variables for start and end, and also protecting from mistakes when using non-void* variables when calculating n
- Rework the patch "s390/sclp_ocf: Fix computation of length of GDS values"
- Improved commit description as suggested by Peter

Changes since v4
----------------
- Drop patch "s390/sclp: Drop volatile type class from SCLP state variables"
- There are several doubts to it being correct in all situations
- Introduce the macro sclp_gds_for_each()
- Reusable and safe iteration over GDS {sub}vectors
- Make use of sclp_gds_for_each() in SCLP TTY
- Rework the patch "s390/sclp: Ensure no callback gets called after sclp_{un}register() returns"
- Remove waiting for SCLP mask and reading states to become idle from sclp_register() on sclp_init_mask() failure
- First, it is incorrect to sleep in sclp_register() which is called from atomic context
- sclp_console_init() -> sclp_rw_init() -> sclp_register()
- sclp_vt220_con_init() -> __sclp_vt220_init() -> sclp_register()
- Second, it is redundant because no race situation can occur if sclp_init_mask() fails because in that case no events can be received from SCLP due to SCLP receive event mask update performed in sclp_init_mask() having failed
- Add might_sleep() to sclp_unregister() to indicate that the function could potentially sleep
- Adjust coding style of function sclp_unregister()
- Add "Fixes" tag where necessary

Changes since v3
----------------
- Rework the patch "s390/sclp: Ensure no callback gets called after sclp_{un}register() returns"
- Shorten and reword the commit description
- Replace wake_up_all_locked() with wake_up_all()
- Replace sclp_init_state with sclp_mask_state in wait queue condition
- Call wake_up_all() unconditionally
- Add call to wake_up_call() in sclp_init_mask() after updating sclp_mask_state

Changes since v2
----------------
- Add 2 new patches:
- s390/sclp: Drop volatile type class from SCLP state variables
- s390/sclp: Improve robustness of sclp_find_gds_{sub}vector()
- Rework the patch "s390/sclp: Ensure no callback gets called after sclp_unregister() returns" to implement Peter Oberparleiter's suggestion with a global wait queue and checking
the state variables as its condition. It turns out the implementation with a single completion per struct sclp_register is inadequate because theoretically the callback state_change_fn() and receive_fn() could get invoked in parallel, however unlikely. Furthermore, the same race situation might happen with sclp_register() too.

Changes since v1
----------------
- Drop redundant empty lines in sclp.c
- Make commit message more verbose for the fix in sclp.c

Alexander Egorenkov (5):
s390/sclp: Make parsing of received event buffers more robust s390/sclp: Introduce macro sclp_gds_for_each() s390/sclp_tty: Make use of sclp_gds_for_each() s390/sclp_ocf: Fix computation of length of GDS values s390/sclp: Ensure no callback gets called after sclp_unregister()
returns

 drivers/s390/char/sclp.c     | 43 +++++++++++++++++++++++++++---------
 drivers/s390/char/sclp.h     | 22 +++++++++++++-----
 drivers/s390/char/sclp_ocf.c |  4 ++--
 drivers/s390/char/sclp_tty.c | 21 ++++++++----------
 4 files changed, 60 insertions(+), 30 deletions(-)
Signature · 1 line
2.53.0