Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d3e8aa8 authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David S. Miller
Browse files

sctp: allow sctp_init_cause to return errors 



And do so if the skb doesn't have enough space for the payload.
This is a preparation for the next patch.

Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 065662d9

include/net/sctp/sm.h

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ struct sctp_chunk *sctp_make_shutdown_ack(const struct sctp_association *asoc, 
struct sctp_chunk *sctp_make_shutdown_complete(

					const struct sctp_association *asoc,

					const struct sctp_chunk *chunk);

void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause, size_t paylen);

int sctp_init_cause(struct sctp_chunk *chunk, __be16 cause, size_t paylen);

struct sctp_chunk *sctp_make_abort(const struct sctp_association *asoc,

				   const struct sctp_chunk *chunk,

				   const size_t hint);

net/sctp/sm_make_chunk.c

+9 −3
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static const struct sctp_paramhdr prsctp_param = { 
 * provided chunk, as most cause codes will be embedded inside an

 * abort chunk.

 */

void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code,

int sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code,

		    size_t paylen)

{

	struct sctp_errhdr err;
@@ -168,7 +168,13 @@ void sctp_init_cause(struct sctp_chunk *chunk, __be16 cause_code, 
	err.cause = cause_code;

	len = sizeof(err) + paylen;

	err.length = htons(len);



	if (skb_tailroom(chunk->skb) < len)

		return -ENOSPC;



	chunk->subh.err_hdr = sctp_addto_chunk(chunk, sizeof(err), &err);



	return 0;

}



/* A helper to initialize an op error inside a