linux-stable.git/fs/dlm, branch v4.4.232

dlm: remove BUG() before panic()

2020-06-30T00:07:51+00:00

[ Upstream commit fe204591cc9480347af7d2d6029b24a62e449486 ]

Building a kernel with clang sometimes fails with an objtool error in dlm:

fs/dlm/lock.o: warning: objtool: revert_lock_pc()+0xbd: can't find jump dest instruction at .text+0xd7fc

The problem is that BUG() never returns and the compiler knows
that anything after it is unreachable, however the panic still
emits some code that does not get fully eliminated.

Having both BUG() and panic() is really pointless as the BUG()
kills the current process and the subsequent panic() never hits.
In most cases, we probably don't really want either and should
replace the DLM_ASSERT() statements with WARN_ON(), as has
been done for some of them.

Remove the BUG() here so the user at least sees the panic message
and we can reliably build randconfig kernels.

Fixes: e7fd41792fc0 ("[DLM] The core of the DLM for GFS2/CLVM")
Cc: Josh Poimboeuf 
Cc: clang-built-linux@googlegroups.com
Signed-off-by: Arnd Bergmann 
Signed-off-by: David Teigland 
Signed-off-by: Sasha Levin

dlm: fix invalid cluster name warning

2019-12-21T09:34:44+00:00

[ Upstream commit 3595c559326d0b660bb088a88e22e0ca630a0e35 ]

The warning added in commit 3b0e761ba83
  "dlm: print log message when cluster name is not set"

did not account for the fact that lockspaces created
from userland do not supply a cluster name, so bogus
warnings are printed every time a userland lockspace
is created.

Signed-off-by: David Teigland 
Signed-off-by: Sasha Levin

dlm: NULL check before kmem_cache_destroy is not needed

2019-12-21T09:34:39+00:00

[ Upstream commit f31a89692830061bceba8469607e4e4b0f900159 ]

kmem_cache_destroy(NULL) is safe, so removes NULL check before
freeing the mem. This patch also fix ifnullfree.cocci warnings.

Signed-off-by: Wen Yang 
Signed-off-by: David Teigland 
Signed-off-by: Sasha Levin

dlm: fix missing idr_destroy for recover_idr

2019-12-21T09:34:28+00:00

[ Upstream commit 8fc6ed9a3508a0435b9270c313600799d210d319 ]

Which would leak memory for the idr internals.

Signed-off-by: David Teigland 
Signed-off-by: Sasha Levin

dlm: don't leak kernel pointer to userspace

2019-11-28T17:26:07+00:00

[ Upstream commit 9de30f3f7f4d31037cfbb7c787e1089c1944b3a7 ]

In copy_result_to_user(), we first create a struct dlm_lock_result, which
contains a struct dlm_lksb, the last member of which is a pointer to the
lvb. Unfortunately, we copy the entire struct dlm_lksb to the result
struct, which is then copied to userspace at the end of the function,
leaking the contents of sb_lvbptr, which is a valid kernel pointer in some
cases (indeed, later in the same function the data it points to is copied
to userspace).

It is an error to leak kernel pointers to userspace, as it undermines KASLR
protections (see e.g. 65eea8edc31 ("floppy: Do not copy a kernel pointer to
user memory in FDGETPRM ioctl") for another example of this).

Signed-off-by: Tycho Andersen 
Signed-off-by: David Teigland 
Signed-off-by: Sasha Levin

dlm: fix invalid free

2019-11-28T17:26:07+00:00

[ Upstream commit d968b4e240cfe39d39d80483bac8bca8716fd93c ]

dlm_config_nodes() does not allocate nodes on failure, so we should not
free() nodes when it fails.

Signed-off-by: Tycho Andersen 
Signed-off-by: David Teigland 
Signed-off-by: Sasha Levin

dlm: Don't swamp the CPU with callbacks queued during recovery

2019-02-20T09:13:04+00:00

[ Upstream commit 216f0efd19b9cc32207934fd1b87a45f2c4c593e ]

Before this patch, recovery would cause all callbacks to be delayed,
put on a queue, and afterward they were all queued to the callback
work queue. This patch does the same thing, but occasionally takes
a break after 25 of them so it won't swamp the CPU at the expense
of other RT processes like corosync.

Signed-off-by: Bob Peterson 
Signed-off-by: David Teigland 
Signed-off-by: Sasha Levin

dlm: memory leaks on error path in dlm_user_request()

2019-01-13T09:05:33+00:00

commit d47b41aceeadc6b58abc9c7c6485bef7cfb75636 upstream.

According to comment in dlm_user_request() ua should be freed
in dlm_free_lkb() after successful attach to lkb.

However ua is attached to lkb not in set_lock_args() but later,
inside request_lock().

Fixes 597d0cae0f99 ("[DLM] dlm: user locks")
Cc: stable@kernel.org # 2.6.19

Signed-off-by: Vasily Averin 
Signed-off-by: David Teigland 
Signed-off-by: Greg Kroah-Hartman

dlm: lost put_lkb on error path in receive_convert() and receive_unlock()

2019-01-13T09:05:33+00:00

commit c0174726c3976e67da8649ac62cae43220ae173a upstream.

Fixes 6d40c4a708e0 ("dlm: improve error and debug messages")
Cc: stable@kernel.org # 3.5

Signed-off-by: Vasily Averin 
Signed-off-by: David Teigland 
Signed-off-by: Greg Kroah-Hartman

dlm: possible memory leak on error path in create_lkb()

2019-01-13T09:05:33+00:00

commit 23851e978f31eda8b2d01bd410d3026659ca06c7 upstream.

Fixes 3d6aa675fff9 ("dlm: keep lkbs in idr")
Cc: stable@kernel.org # 3.1

Signed-off-by: Vasily Averin 
Signed-off-by: David Teigland 
Signed-off-by: Greg Kroah-Hartman