0003-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. From 3a223ca3ebc7ac24d7726a0cd58e5695bc813657 Mon Sep 17 00:00:00 2001
  2. From: Andreas Fritiofson <andreas.fritiofson@gmail.com>
  3. Date: Sat, 13 Jan 2018 21:00:47 +0100
  4. Subject: [PATCH] CVE-2018-5704: Prevent some forms of Cross Protocol Scripting
  5. attacks
  6. OpenOCD can be targeted by a Cross Protocol Scripting attack from
  7. a web browser running malicious code, such as the following PoC:
  8. var x = new XMLHttpRequest();
  9. x.open("POST", "http://127.0.0.1:4444", true);
  10. x.send("exec xcalc\r\n");
  11. This mitigation should provide some protection from browser-based
  12. attacks and is based on the corresponding fix in Redis:
  13. https://github.com/antirez/redis/blob/8075572207b5aebb1385c4f233f5302544439325/src/networking.c#L1758
  14. Upstream-status: Under review: http://openocd.zylin.com/#/c/4335/
  15. Change-Id: Ia96ebe19b74b5805dc228bf7364c7971a90a4581
  16. Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
  17. Reported-by: Josef Gajdusek <atx@atx.name>
  18. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  19. ---
  20. src/server/startup.tcl | 11 +++++++++++
  21. 1 file changed, 11 insertions(+)
  22. diff --git a/src/server/startup.tcl b/src/server/startup.tcl
  23. index 64ace407..dd1b31e4 100644
  24. --- a/src/server/startup.tcl
  25. +++ b/src/server/startup.tcl
  26. @@ -8,3 +8,14 @@ proc ocd_gdb_restart {target_id} {
  27. # one target
  28. reset halt
  29. }
  30. +
  31. +proc prevent_cps {} {
  32. + echo "Possible SECURITY ATTACK detected."
  33. + echo "It looks like somebody is sending POST or Host: commands to OpenOCD."
  34. + echo "This is likely due to an attacker attempting to use Cross Protocol Scripting"
  35. + echo "to compromise your OpenOCD instance. Connection aborted."
  36. + exit
  37. +}
  38. +
  39. +proc POST {args} { prevent_cps }
  40. +proc Host: {args} { prevent_cps }
  41. --
  42. 2.11.0