SVM-SEV: convert the rest of fget() uses to fdget() in there

Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c
index c25aeb550cd97fbbbae82e7f1b95a5d0f8bc8add..52398d49bc2f54f50f7dd0e9a461d16843b703a0 100644 (file)
--- a/arch/x86/kvm/svm/sev.c
+++ b/arch/x86/kvm/svm/sev.c
@@ -1767,18 +1767,20 @@ int sev_vm_move_enc_context_from(struct kvm *kvm, unsigned int source_fd)
 {
        struct kvm_sev_info *dst_sev = &to_kvm_svm(kvm)->sev_info;
        struct kvm_sev_info *src_sev, *cg_cleanup_sev;
-       struct file *source_kvm_file;
+       struct fd f = fdget(source_fd);
        struct kvm *source_kvm;
        bool charged = false;
        int ret;
 
-       source_kvm_file = fget(source_fd);
-       if (!file_is_kvm(source_kvm_file)) {
+       if (!f.file)
+               return -EBADF;
+
+       if (!file_is_kvm(f.file)) {
                ret = -EBADF;
                goto out_fput;
        }
 
-       source_kvm = source_kvm_file->private_data;
+       source_kvm = f.file->private_data;
        ret = sev_lock_two_vms(kvm, source_kvm);
        if (ret)
                goto out_fput;
@@ -1828,8 +1830,7 @@ out_dst_cgroup:
 out_unlock:
        sev_unlock_two_vms(kvm, source_kvm);
 out_fput:
-       if (source_kvm_file)
-               fput(source_kvm_file);
+       fdput(f);
        return ret;
 }
 
@@ -2046,18 +2047,20 @@ failed:
 
 int sev_vm_copy_enc_context_from(struct kvm *kvm, unsigned int source_fd)
 {
-       struct file *source_kvm_file;
+       struct fd f = fdget(source_fd);
        struct kvm *source_kvm;
        struct kvm_sev_info *source_sev, *mirror_sev;
        int ret;
 
-       source_kvm_file = fget(source_fd);
-       if (!file_is_kvm(source_kvm_file)) {
+       if (!f.file)
+               return -EBADF;
+
+       if (!file_is_kvm(f.file)) {
                ret = -EBADF;
                goto e_source_fput;
        }
 
-       source_kvm = source_kvm_file->private_data;
+       source_kvm = f.file->private_data;
        ret = sev_lock_two_vms(kvm, source_kvm);
        if (ret)
                goto e_source_fput;
@@ -2103,8 +2106,7 @@ int sev_vm_copy_enc_context_from(struct kvm *kvm, unsigned int source_fd)
 e_unlock:
        sev_unlock_two_vms(kvm, source_kvm);
 e_source_fput:
-       if (source_kvm_file)
-               fput(source_kvm_file);
+       fdput(f);
        return ret;
 }