sctp: do not mark sk dumped when inet_sctp_diag_fill returns err

lxin · davem330 · commit 8c7c19a55e41 · 2017-09-15T14:51:15.000-07:00
sctp_diag would not actually dump out sk/asoc if inet_sctp_diag_fill returns err, in which case it shouldn't mark sk dumped by setting cb->args[3] as 1 in sctp_sock_dump(). Otherwise, it could cause some asocs to have no parent's sk dumped in 'ss --sctp'. So this patch is to not set cb->args[3] when inet_sctp_diag_fill() returns err in sctp_sock_dump(). Fixes: 8f840e4 ("sctp: add the sctp_diag.c file") Signed-off-by: Xin Long <lucien.xin@gmail.com> Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/sctp/sctp_diag.c b/net/sctp/sctp_diag.c
@@ -309,7 +309,6 @@ static int sctp_sock_dump(struct sctp_transport *tsp, void *p)
 					cb->nlh->nlmsg_seq,
 					NLM_F_MULTI, cb->nlh,
 					commp->net_admin) < 0) {
-			cb->args[3] = 1;
 			err = 1;
 			goto release;
 		}

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,6 @@ static int sctp_sock_dump(struct sctp_transport tsp, void p)`
`309`	`309`	`cb->nlh->nlmsg_seq,`
`310`	`310`	`NLM_F_MULTI, cb->nlh,`
`311`	`311`	`commp->net_admin) < 0) {`
`312`		`- cb->args[3] = 1;`
`313`	`312`	`err = 1;`
`314`	`313`	`goto release;`
`315`	`314`	`}`