diff options
| author | Jiri Bohac <jbohac@suse.cz> | 2011-02-17 13:12:08 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-19 19:06:55 -0800 |
| commit | 2205a6ea93fea76f88b43727fea53f3ce3790d6f (patch) | |
| tree | 440ff9d40ce5eeee3c85e22feea20f2a0c4d4065 /net | |
| parent | 226111d1fbe611bc7a5ffaa5275ccb41e73fd011 (diff) | |
| download | kernel_samsung_aries-2205a6ea93fea76f88b43727fea53f3ce3790d6f.zip kernel_samsung_aries-2205a6ea93fea76f88b43727fea53f3ce3790d6f.tar.gz kernel_samsung_aries-2205a6ea93fea76f88b43727fea53f3ce3790d6f.tar.bz2 | |
sctp: fix reporting of unknown parameters
commit 5fa782c2f5ef6c2e4f04d3e228412c9b4a4c8809 re-worked the
handling of unknown parameters. sctp_init_cause_fixed() can now
return -ENOSPC if there is not enough tailroom in the error
chunk skb. When this happens, the error header is not appended to
the error chunk. In that case, the payload of the unknown parameter
should not be appended either.
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Acked-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/sm_make_chunk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/sctp/sm_make_chunk.c b/net/sctp/sm_make_chunk.c index 2cc46f0..b23428f 100644 --- a/net/sctp/sm_make_chunk.c +++ b/net/sctp/sm_make_chunk.c @@ -2029,11 +2029,11 @@ static sctp_ierror_t sctp_process_unk_param(const struct sctp_association *asoc, *errp = sctp_make_op_error_fixed(asoc, chunk); if (*errp) { - sctp_init_cause_fixed(*errp, SCTP_ERROR_UNKNOWN_PARAM, - WORD_ROUND(ntohs(param.p->length))); - sctp_addto_chunk_fixed(*errp, - WORD_ROUND(ntohs(param.p->length)), - param.v); + if (!sctp_init_cause_fixed(*errp, SCTP_ERROR_UNKNOWN_PARAM, + WORD_ROUND(ntohs(param.p->length)))) + sctp_addto_chunk_fixed(*errp, + WORD_ROUND(ntohs(param.p->length)), + param.v); } else { /* If there is no memory for generating the ERROR * report as specified, an ABORT will be triggered |