001-fix-CVE-2020-36254.patch 700 B

123456789101112131415161718192021
  1. From 8f8a3dff705fad774a10864a2e3dbcfa9779ceff Mon Sep 17 00:00:00 2001
  2. From: Haelwenn Monnier <contact+github.com@hacktivis.me>
  3. Date: Mon, 25 May 2020 14:54:29 +0200
  4. Subject: [PATCH] scp.c: Port OpenSSH CVE-2018-20685 fix (#80)
  5. ---
  6. scp.c | 3 ++-
  7. 1 file changed, 2 insertions(+), 1 deletion(-)
  8. --- a/scp.c
  9. +++ b/scp.c
  10. @@ -935,7 +935,8 @@ sink(int argc, char **argv)
  11. size = size * 10 + (*cp++ - '0');
  12. if (*cp++ != ' ')
  13. SCREWUP("size not delimited");
  14. - if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) {
  15. + if (*cp == '\0' || strchr(cp, '/') != NULL ||
  16. + strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) {
  17. run_err("error: unexpected filename: %s", cp);
  18. exit(1);
  19. }