Attachment 659597 Details for Bug 751464 – A partial fix for the prelink verify/directory modification problem

[patch] A partial fix for the prelink verify/directory modification problem

prelink-verify.patch (text/plain), 1.67 KB, created by Mark Carson on 2012-12-07 21:33:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Carson

Created: 2012-12-07 21:33:32 UTC

Size: 1.67 KB

patch

obsolete

>::::::::::
>prelink/src/exec.c
>::::::::::
>*** prelink/src/exec.c.orig	Sun Aug 13 11:18:17 2006
>--- prelink/src/exec.c	Fri Dec  7 11:35:46 2012
>***************
>*** 438,444 ****
>    ehdr.e_shnum = dso->ehdr.e_shnum;
>    dso->ehdr = ehdr;
>    memcpy (dso->phdr, phdr, ehdr.e_phnum * sizeof (GElf_Phdr));
>!   if (reopen_dso (dso, move, NULL))
>      goto error_out;
>  
>    assert (i == dso->ehdr.e_shnum);
>--- 438,445 ----
>    ehdr.e_shnum = dso->ehdr.e_shnum;
>    dso->ehdr = ehdr;
>    memcpy (dso->phdr, phdr, ehdr.e_phnum * sizeof (GElf_Phdr));
>!   /*@@if (reopen_dso (dso, move, NULL))*/
>!   if (reopen_dso (dso, move, (undo_output && strcmp (undo_output, "-") == 0) ? "/tmp/undo" : undo_output))
>      goto error_out;
>  
>    assert (i == dso->ehdr.e_shnum);
>::::::::::
>prelink/src/main.c
>::::::::::
>*** prelink/src/main.c.orig	Wed Oct 12 11:36:10 2011
>--- prelink/src/main.c	Thu Dec  6 16:02:10 2012
>***************
>*** 319,326 ****
>    if (remaining == argc && ! all)
>      error (EXIT_FAILURE, 0, "no files given and --all not used");
>  
>!   if (undo_output && (!undo || all))
>!     error (EXIT_FAILURE, 0, "-o can be only specified together with -u and without -a");
>  
>    if (undo_output && remaining + 1 != argc)
>      error (EXIT_FAILURE, 0, "-o can only be used when undoing a single object");
>--- 319,326 ----
>    if (remaining == argc && ! all)
>      error (EXIT_FAILURE, 0, "no files given and --all not used");
>  
>!   if (undo_output && (!(undo || verify) || all))
>!     error (EXIT_FAILURE, 0, "-o can be only specified together with -u or -v and without -a");
>  
>    if (undo_output && remaining + 1 != argc)
>      error (EXIT_FAILURE, 0, "-o can only be used when undoing a single object");

Actions: View | Diff

Attachments on bug 751464: 659597