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

Commit 8e6cc45b authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman
Browse files

parisc: Fix return code of pdc_iodc_print() 



commit 5d1335dabb3c493a3d6d5b233953b6ac7b6c1ff2 upstream.

There is an off-by-one if the printed string includes a new-line
char.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7f5df45f

arch/parisc/kernel/firmware.c

+3 −2
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ static char __attribute__((aligned(64))) iodc_dbuf[4096]; 
 */

int pdc_iodc_print(const unsigned char *str, unsigned count)

{

	unsigned int i;

	unsigned int i, found = 0;

	unsigned long flags;



	for (i = 0; i < count;) {
@@ -1238,6 +1238,7 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) 
			iodc_dbuf[i+0] = '\r';

			iodc_dbuf[i+1] = '\n';

			i += 2;

			found = 1;

			goto print;

		default:

			iodc_dbuf[i] = str[i];
@@ -1254,7 +1255,7 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) 
                    __pa(iodc_retbuf), 0, __pa(iodc_dbuf), i, 0);

        spin_unlock_irqrestore(&pdc_lock, flags);



	return i;

	return i - found;

}



#if !defined(BOOTLOADER)