Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleans /tmp/ida every time ida is called #853

Merged
merged 5 commits into from
Aug 10, 2018
Merged

cleans /tmp/ida every time ida is called #853

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a70f921
cleans /tmp/ida every time ida is called
gitoleg Aug 8, 2018
aed4546
refactored
gitoleg Aug 8, 2018
845410c
added info message
gitoleg Aug 8, 2018
5fb4565
renamed
gitoleg Aug 8, 2018
9c4279c
updated after review
gitoleg Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions plugins/ida/bap_ida_service.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ open Core_kernel.Std
open Bap_ida.Std
open Bap.Std

include Self ()

type ida_kind = [ `idal | `idal64 | `idaq | `idaq64 ] [@@deriving sexp]

type ida = {
Expand All @@ -12,15 +14,15 @@ type ida = {
debug : int;
} [@@deriving sexp]

module Config = struct
module Ida_config = struct
type t = {
ida_path : string;
ida_kind : ida_kind option;
curses : string option;
debug : int;
}
end
type config = Config.t
type config = Ida_config.t

type 'a command = 'a Command.t

Expand Down Expand Up @@ -79,8 +81,25 @@ let setup_headless_env path =
if old_path <> "" then Unix.putenv var old_path
with _ -> ()

let cleanup_minidump () =
let is_dump x = Filename.check_suffix x ".dmp" in
let dump_path = "/tmp/ida" in
if Sys.file_exists dump_path && Sys.is_directory dump_path then
FileUtil.ls dump_path |>
List.filter ~f:is_dump |> function
| [] -> ()
| files ->
info "ida minidump is not empty";
let lock = sprintf "%s/lock" dump_path in
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

protect this code with finally, to ensure that the file is always unlocked.

let lock = Unix.openfile lock Unix.[O_RDWR; O_CREAT] 0o666 in
Unix.lockf lock Unix.F_LOCK 0;
protect ~f:(fun () ->
List.iter files ~f:Sys.remove)
~finally:(fun () -> Unix.lockf lock Unix.F_ULOCK 0)

(* ida works fine only if everything is in the same folder *)
let run (t:ida) cmd =
cleanup_minidump ();
let cwd = Unix.getcwd () in
let clean = match t.curses with
| Some path -> setup_headless_env path
Expand All @@ -90,14 +109,13 @@ let run (t:ida) cmd =
try cmd (); cleanup ()
with exn -> cleanup (); raise exn


let check_path path = match Bap_ida_check.check_path path with
| Ok () -> ()
| Error e ->
eprintf "failed to check ida path: %s." (Error.to_string_hum e);
exit 1

let create {Config.ida_path; ida_kind; debug; curses} target =
let create {Ida_config.ida_path; ida_kind; debug; curses} target =
if not (Sys.file_exists target)
then invalid_argf "Can't find target executable" ();
let exe = Filename.temp_file "bap_" "_ida" in
Expand Down Expand Up @@ -158,9 +176,9 @@ let register ida_path ida_kind is_headless : unit =
let curses = if Sys.os_type = "Unix" && is_headless
then find_curses () else None in
let debug =
try Int.of_string (Sys.getenv "BAP_IDA_DEBUG") with exn -> 0 in
try Int.of_string (Sys.getenv "BAP_IDA_DEBUG") with _exn -> 0 in
let config = {
Config.ida_path;
Ida_config.ida_path;
ida_kind;
curses;
debug
Expand Down