diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2015-08-12 00:22:24 +0200 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2015-08-17 23:22:21 +0200 |
| commit | acee4e527d5f069351f835602b23602d01de5e1f (patch) | |
| tree | 5b3656ad50cb95fd579355579fcf74f1f99e69c9 | |
| parent | dlm: use sctp 1-to-1 API (diff) | |
| download | linux-acee4e527d5f069351f835602b23602d01de5e1f.tar.xz linux-acee4e527d5f069351f835602b23602d01de5e1f.zip | |
dlm: replace BUG_ON with a less severe handling
BUG_ON() is a severe action for this case, specially now that DLM with
SCTP will use 1 socket per association. Instead, we can just close the
socket on this error condition and return from the function.
Also move the check to an earlier stage as it won't change and thus we
can abort as soon as possible.
Although this issue was reported when still using SCTP with 1-to-many
API, this cleanup wouldn't be that simple back then because we couldn't
close the socket and making sure such event would cease would be hard.
And actually, previous code was closing the association, yet SCTP layer
is still raising the new data event. Probably a bug to be fixed in SCTP.
Reported-by: <tan.hu@zte.com.cn>
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David Teigland <teigland@redhat.com>
| -rw-r--r-- | fs/dlm/lowcomms.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index 856d750be96b..4ea64e93e6b1 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -542,6 +542,10 @@ static int receive_from_sock(struct connection *con) ret = -EAGAIN; goto out_close; } + if (con->nodeid == 0) { + ret = -EINVAL; + goto out_close; + } if (con->rx_page == NULL) { /* @@ -582,8 +586,6 @@ static int receive_from_sock(struct connection *con) else if (ret == len) call_again_soon = 1; - BUG_ON(con->nodeid == 0); - cbuf_add(&con->cb, ret); ret = dlm_process_incoming_buffer(con->nodeid, page_address(con->rx_page), |