mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
sparc64: ldc abort during vds iso boot
Orabug: 20902628 When an ldc control-only packet is received during data exchange in read_nonraw(), a new rx head is calculated but the rx queue head is not actually advanced (rx_set_head() is not called) and a branch is taken to 'no_data' at which point two things can happen depending on the value of the newly calculated rx head and the current rx tail: - If the rx queue is determined to be not empty, then the wrong packet is picked up. - If the rx queue is determined to be empty, then a read error (EAGAIN) is eventually returned since it is falsely assumed that more data was expected. The fix is to update the rx head and return in case of a control only packet during data exchange. Signed-off-by: Jagannathan Raman <jag.raman@oracle.com> Reviewed-by: Aaron Young <aaron.young@oracle.com> Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com> Reviewed-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com> Reviewed-by: Liam Merwick <liam.merwick@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
fc43b978a0
commit
6c95483b76
1 changed files with 6 additions and 1 deletions
|
@ -1778,9 +1778,14 @@ static int read_nonraw(struct ldc_channel *lp, void *buf, unsigned int size)
|
||||||
|
|
||||||
lp->rcv_nxt = p->seqid;
|
lp->rcv_nxt = p->seqid;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If this is a control-only packet, there is nothing
|
||||||
|
* else to do but advance the rx queue since the packet
|
||||||
|
* was already processed above.
|
||||||
|
*/
|
||||||
if (!(p->type & LDC_DATA)) {
|
if (!(p->type & LDC_DATA)) {
|
||||||
new = rx_advance(lp, new);
|
new = rx_advance(lp, new);
|
||||||
goto no_data;
|
break;
|
||||||
}
|
}
|
||||||
if (p->stype & (LDC_ACK | LDC_NACK)) {
|
if (p->stype & (LDC_ACK | LDC_NACK)) {
|
||||||
err = data_ack_nack(lp, p);
|
err = data_ack_nack(lp, p);
|
||||||
|
|
Loading…
Reference in a new issue