Skip to content

fix two bugs#475

Merged
sjenning merged 1 commit intodynup:masterfrom
rousya:master
Jan 19, 2015
Merged

fix two bugs#475
sjenning merged 1 commit intodynup:masterfrom
rousya:master

Conversation

@rousya
Copy link

@rousya rousya commented Dec 31, 2014

2814237 create-diff-object: fix a potential overflow for rela type
f1683eb kpatch-build: fix ERROR: two parent matches for x.o

Copy link
Member

Choose a reason for hiding this comment

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

Hm, I think I'm missing something. How can the argument to find_kobj ever be something like arch/x86/kvm/../../../virt/kvm/kvm_main.o? The caller of find_kobj is:

FILES="$(find * -type f)"
cd "$TEMPDIR"
mkdir output
declare -A objnames
CHANGED=0
ERROR=0
for i in $FILES; do
    mkdir -p "output/$(dirname $i)"
    cd "$OBJDIR"
    find_kobj $i

It gets the filename from the "find" command. So I would expect the argument to find_kobj to be virt/kvm/kvm_main.o already.

Copy link
Author

Choose a reason for hiding this comment

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

Oh, it's my fault. I checked changed_objs and found 'arch/x86/kvm/../../../virt/kvm/kvm_main.o'.
Please ingore this patch.
Sorry.
Need I re-open a pull-request?

Copy link
Member

Choose a reason for hiding this comment

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

No need to open a new pull request. You can just rebase this patch and git push --force to the same branch.

Copy link
Author

Choose a reason for hiding this comment

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

Sorry for late. I've rebased and pushed again. Thanks.

@jpoimboe
Copy link
Member

@rousya Looks good to me, can you please rebase to the latest master?

rela.type should be unsigned int instead of unsighed char.

/usr/include/gelf.h:#define GELF_R_TYPE(info)   ELF64_R_TYPE (info)
/usr/include/elf.h:#define ELF64_R_TYPE(i)      ((i) & 0xffffffff)

Signed-off-by: Xie XiuQi <[email protected]>
@rousya
Copy link
Author

rousya commented Jan 19, 2015

Hi @jpoimboe,
I've rebase it to the latest master.

@jpoimboe
Copy link
Member

👍

sjenning added a commit that referenced this pull request Jan 19, 2015
@sjenning sjenning merged commit 4c6e54b into dynup:master Jan 19, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants