Skip to content

Commit

Permalink
net: sctp: Move sequence start handling into sctp_transport_get_idx()
Browse files Browse the repository at this point in the history
net/sctp/proc.c: In function ‘sctp_transport_get_idx’:
net/sctp/proc.c:313: warning: ‘obj’ may be used uninitialized in this function

This is currently a false positive, as all callers check for a zero
offset first, and handle this case in the exact same way.

Move the check and handling into sctp_transport_get_idx() to kill the
compiler warning, and avoid future bugs.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Geert Uytterhoeven authored and David S. Miller committed Jan 15, 2016
1 parent 34ae6a1 commit fb33118
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/sctp/proc.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ static struct sctp_transport *sctp_transport_get_next(struct seq_file *seq)
static struct sctp_transport *sctp_transport_get_idx(struct seq_file *seq,
loff_t pos)
{
void *obj;
void *obj = SEQ_START_TOKEN;

while (pos && (obj = sctp_transport_get_next(seq)) && !IS_ERR(obj))
pos--;
Expand Down Expand Up @@ -347,7 +347,7 @@ static void *sctp_assocs_seq_start(struct seq_file *seq, loff_t *pos)
if (err)
return ERR_PTR(err);

return *pos ? sctp_transport_get_idx(seq, *pos) : SEQ_START_TOKEN;
return sctp_transport_get_idx(seq, *pos);
}

static void sctp_assocs_seq_stop(struct seq_file *seq, void *v)
Expand Down Expand Up @@ -462,7 +462,7 @@ static void *sctp_remaddr_seq_start(struct seq_file *seq, loff_t *pos)
if (err)
return ERR_PTR(err);

return *pos ? sctp_transport_get_idx(seq, *pos) : SEQ_START_TOKEN;
return sctp_transport_get_idx(seq, *pos);
}

static void *sctp_remaddr_seq_next(struct seq_file *seq, void *v, loff_t *pos)
Expand Down

0 comments on commit fb33118

Please sign in to comment.