Commit aaf20f87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rpmsg-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux 

Pull rpmsg update from Bjorn Andersson:
 "Correct GLINK driver's decoding of the CMD_OPEN message, as upper half
  of the second parameter encodes 'priority', and 'length' is only the
  lower half"

* tag 'rpmsg-v6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  rpmsg: glink: use only lower 16-bits of param2 for CMD_OPEN name length
parents 08906abc 06c59d97

drivers/rpmsg/qcom_glink_native.c

+2 −1
Original line number Diff line number Diff line
@@ -1204,7 +1204,8 @@ void qcom_glink_native_rx(struct qcom_glink *glink) 
			ret = qcom_glink_rx_open_ack(glink, param1);

			break;

		case GLINK_CMD_OPEN:

			ret = qcom_glink_rx_defer(glink, param2);

			/* upper 16 bits of param2 are the "prio" field */

			ret = qcom_glink_rx_defer(glink, param2 & 0xffff);

			break;

		case GLINK_CMD_TX_DATA:

		case GLINK_CMD_TX_DATA_CONT: