diff mbox series

fs: smb: common: add missing MODULE_DESCRIPTION() macros

Message ID 20240526-md-fs-smb-common-v1-1-564a0036abe9@quicinc.com
State New
Headers show
Series fs: smb: common: add missing MODULE_DESCRIPTION() macros | expand

Commit Message

Jeff Johnson May 26, 2024, 4:52 p.m. UTC 
Fix the 'make W=1' warnings:
WARNING: modpost: missing MODULE_DESCRIPTION() in fs/smb/common/cifs_arc4.o
WARNING: modpost: missing MODULE_DESCRIPTION() in fs/smb/common/cifs_md4.o

Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
---
 fs/smb/common/cifs_arc4.c | 1 +
 fs/smb/common/cifs_md4.c  | 1 +
 2 files changed, 2 insertions(+)


---
base-commit: 416ff45264d50a983c3c0b99f0da6ee59f9acd68
change-id: 20240526-md-fs-smb-common-e92031f7d8cf

Comments

Steve French May 26, 2024, 7:44 p.m. UTC | #1 
merged into cifs-2.6.git for-next

On Sun, May 26, 2024 at 11:53 AM Jeff Johnson <quic_jjohnson@quicinc.com> wrote:
>
> Fix the 'make W=1' warnings:
> WARNING: modpost: missing MODULE_DESCRIPTION() in fs/smb/common/cifs_arc4.o
> WARNING: modpost: missing MODULE_DESCRIPTION() in fs/smb/common/cifs_md4.o
>
> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> ---
>  fs/smb/common/cifs_arc4.c | 1 +
>  fs/smb/common/cifs_md4.c  | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/fs/smb/common/cifs_arc4.c b/fs/smb/common/cifs_arc4.c
> index 043e4cb839fa..df360ca47826 100644
> --- a/fs/smb/common/cifs_arc4.c
> +++ b/fs/smb/common/cifs_arc4.c
> @@ -10,6 +10,7 @@
>  #include <linux/module.h>
>  #include "arc4.h"
>
> +MODULE_DESCRIPTION("ARC4 Cipher Algorithm");
>  MODULE_LICENSE("GPL");
>
>  int cifs_arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len)
> diff --git a/fs/smb/common/cifs_md4.c b/fs/smb/common/cifs_md4.c
> index 50f78cfc6ce9..7ee7f4dad90c 100644
> --- a/fs/smb/common/cifs_md4.c
> +++ b/fs/smb/common/cifs_md4.c
> @@ -24,6 +24,7 @@
>  #include <asm/byteorder.h>
>  #include "md4.h"
>
> +MODULE_DESCRIPTION("MD4 Message Digest Algorithm (RFC1320)");
>  MODULE_LICENSE("GPL");
>
>  static inline u32 lshift(u32 x, unsigned int s)
>
> ---
> base-commit: 416ff45264d50a983c3c0b99f0da6ee59f9acd68
> change-id: 20240526-md-fs-smb-common-e92031f7d8cf
>
>
Tom Talpey May 27, 2024, 3:26 p.m. UTC | #2 
On 5/26/2024 3:44 PM, Steve French wrote:
> merged into cifs-2.6.git for-next
> 
> On Sun, May 26, 2024 at 11:53 AM Jeff Johnson <quic_jjohnson@quicinc.com> wrote:
>>
>> Fix the 'make W=1' warnings:
>> WARNING: modpost: missing MODULE_DESCRIPTION() in fs/smb/common/cifs_arc4.o
>> WARNING: modpost: missing MODULE_DESCRIPTION() in fs/smb/common/cifs_md4.o
>>
>> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>

Would it be worth adding the word "DEPRECATED" (or some such)?
These are present only for SMB1 down-compat, and we don't want
people to think they're generally useful.

Tom.

>> ---
>>   fs/smb/common/cifs_arc4.c | 1 +
>>   fs/smb/common/cifs_md4.c  | 1 +
>>   2 files changed, 2 insertions(+)
>>
>> diff --git a/fs/smb/common/cifs_arc4.c b/fs/smb/common/cifs_arc4.c
>> index 043e4cb839fa..df360ca47826 100644
>> --- a/fs/smb/common/cifs_arc4.c
>> +++ b/fs/smb/common/cifs_arc4.c
>> @@ -10,6 +10,7 @@
>>   #include <linux/module.h>
>>   #include "arc4.h"
>>
>> +MODULE_DESCRIPTION("ARC4 Cipher Algorithm");
>>   MODULE_LICENSE("GPL");
>>
>>   int cifs_arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len)
>> diff --git a/fs/smb/common/cifs_md4.c b/fs/smb/common/cifs_md4.c
>> index 50f78cfc6ce9..7ee7f4dad90c 100644
>> --- a/fs/smb/common/cifs_md4.c
>> +++ b/fs/smb/common/cifs_md4.c
>> @@ -24,6 +24,7 @@
>>   #include <asm/byteorder.h>
>>   #include "md4.h"
>>
>> +MODULE_DESCRIPTION("MD4 Message Digest Algorithm (RFC1320)");
>>   MODULE_LICENSE("GPL");
>>
>>   static inline u32 lshift(u32 x, unsigned int s)
>>
>> ---
>> base-commit: 416ff45264d50a983c3c0b99f0da6ee59f9acd68
>> change-id: 20240526-md-fs-smb-common-e92031f7d8cf
>>
>>
> 
>
Steve French May 28, 2024, 8:11 p.m. UTC | #3 
> > Would it be worth adding the word "DEPRECATED"

Perhaps, but it might get confusing since those two modules are loaded
by default (and ksmbd also loads cifs_arc4, but not cifs_md4)

Note that Reiserfs shows "deprecated" in the config menu (Kconfig) but
doesn't mention deprecated in modinfo (in the Description field)

An obvious first step would be to allow cifs.ko to be loaded without
cifs_arc4 and cifs_md4 being available but simply limit the auth protocols if
those two modules aren't available.

On Mon, May 27, 2024 at 10:26 AM Tom Talpey <tom@talpey.com> wrote:
>
> On 5/26/2024 3:44 PM, Steve French wrote:
> > merged into cifs-2.6.git for-next
> >
> > On Sun, May 26, 2024 at 11:53 AM Jeff Johnson <quic_jjohnson@quicinc.com> wrote:
> >>
> >> Fix the 'make W=1' warnings:
> >> WARNING: modpost: missing MODULE_DESCRIPTION() in fs/smb/common/cifs_arc4.o
> >> WARNING: modpost: missing MODULE_DESCRIPTION() in fs/smb/common/cifs_md4.o
> >>
> >> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
>
> Would it be worth adding the word "DEPRECATED" (or some such)?
> These are present only for SMB1 down-compat, and we don't want
> people to think they're generally useful.
>
> Tom.
>
> >> ---
> >>   fs/smb/common/cifs_arc4.c | 1 +
> >>   fs/smb/common/cifs_md4.c  | 1 +
> >>   2 files changed, 2 insertions(+)
> >>
> >> diff --git a/fs/smb/common/cifs_arc4.c b/fs/smb/common/cifs_arc4.c
> >> index 043e4cb839fa..df360ca47826 100644
> >> --- a/fs/smb/common/cifs_arc4.c
> >> +++ b/fs/smb/common/cifs_arc4.c
> >> @@ -10,6 +10,7 @@
> >>   #include <linux/module.h>
> >>   #include "arc4.h"
> >>
> >> +MODULE_DESCRIPTION("ARC4 Cipher Algorithm");
> >>   MODULE_LICENSE("GPL");
> >>
> >>   int cifs_arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len)
> >> diff --git a/fs/smb/common/cifs_md4.c b/fs/smb/common/cifs_md4.c
> >> index 50f78cfc6ce9..7ee7f4dad90c 100644
> >> --- a/fs/smb/common/cifs_md4.c
> >> +++ b/fs/smb/common/cifs_md4.c
> >> @@ -24,6 +24,7 @@
> >>   #include <asm/byteorder.h>
> >>   #include "md4.h"
> >>
> >> +MODULE_DESCRIPTION("MD4 Message Digest Algorithm (RFC1320)");
> >>   MODULE_LICENSE("GPL");
> >>
> >>   static inline u32 lshift(u32 x, unsigned int s)
> >>
> >> ---
> >> base-commit: 416ff45264d50a983c3c0b99f0da6ee59f9acd68
> >> change-id: 20240526-md-fs-smb-common-e92031f7d8cf
> >>
> >>
> >
> >
Tom Talpey May 29, 2024, 8:14 p.m. UTC | #4 
On 5/28/2024 4:11 PM, Steve French wrote:
>>> Would it be worth adding the word "DEPRECATED"
> 
> Perhaps, but it might get confusing since those two modules are loaded
> by default (and ksmbd also loads cifs_arc4, but not cifs_md4)
> 
> Note that Reiserfs shows "deprecated" in the config menu (Kconfig) but
> doesn't mention deprecated in modinfo (in the Description field)

Yeah, agreed I withdraw my suggestion. It's loaded by default in
other configs, such as NTLM and ksmbd. Oh, well.

> An obvious first step would be to allow cifs.ko to be loaded without
> cifs_arc4 and cifs_md4 being available but simply limit the auth protocols if
> those two modules aren't available.

Indeed, and perhaps a worthwhile security hardening task.

Tom.

> On Mon, May 27, 2024 at 10:26 AM Tom Talpey <tom@talpey.com> wrote:
>>
>> On 5/26/2024 3:44 PM, Steve French wrote:
>>> merged into cifs-2.6.git for-next
>>>
>>> On Sun, May 26, 2024 at 11:53 AM Jeff Johnson <quic_jjohnson@quicinc.com> wrote:
>>>>
>>>> Fix the 'make W=1' warnings:
>>>> WARNING: modpost: missing MODULE_DESCRIPTION() in fs/smb/common/cifs_arc4.o
>>>> WARNING: modpost: missing MODULE_DESCRIPTION() in fs/smb/common/cifs_md4.o
>>>>
>>>> Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
>>
>> Would it be worth adding the word "DEPRECATED" (or some such)?
>> These are present only for SMB1 down-compat, and we don't want
>> people to think they're generally useful.
>>
>> Tom.
>>
>>>> ---
>>>>    fs/smb/common/cifs_arc4.c | 1 +
>>>>    fs/smb/common/cifs_md4.c  | 1 +
>>>>    2 files changed, 2 insertions(+)
>>>>
>>>> diff --git a/fs/smb/common/cifs_arc4.c b/fs/smb/common/cifs_arc4.c
>>>> index 043e4cb839fa..df360ca47826 100644
>>>> --- a/fs/smb/common/cifs_arc4.c
>>>> +++ b/fs/smb/common/cifs_arc4.c
>>>> @@ -10,6 +10,7 @@
>>>>    #include <linux/module.h>
>>>>    #include "arc4.h"
>>>>
>>>> +MODULE_DESCRIPTION("ARC4 Cipher Algorithm");
>>>>    MODULE_LICENSE("GPL");
>>>>
>>>>    int cifs_arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len)
>>>> diff --git a/fs/smb/common/cifs_md4.c b/fs/smb/common/cifs_md4.c
>>>> index 50f78cfc6ce9..7ee7f4dad90c 100644
>>>> --- a/fs/smb/common/cifs_md4.c
>>>> +++ b/fs/smb/common/cifs_md4.c
>>>> @@ -24,6 +24,7 @@
>>>>    #include <asm/byteorder.h>
>>>>    #include "md4.h"
>>>>
>>>> +MODULE_DESCRIPTION("MD4 Message Digest Algorithm (RFC1320)");
>>>>    MODULE_LICENSE("GPL");
>>>>
>>>>    static inline u32 lshift(u32 x, unsigned int s)
>>>>
>>>> ---
>>>> base-commit: 416ff45264d50a983c3c0b99f0da6ee59f9acd68
>>>> change-id: 20240526-md-fs-smb-common-e92031f7d8cf
>>>>
>>>>
>>>
>>>
> 
> 
>
diff mbox series

Patch

diff --git a/fs/smb/common/cifs_arc4.c b/fs/smb/common/cifs_arc4.c
index 043e4cb839fa..df360ca47826 100644
--- a/fs/smb/common/cifs_arc4.c
+++ b/fs/smb/common/cifs_arc4.c
@@ -10,6 +10,7 @@ 
 #include <linux/module.h>
 #include "arc4.h"
 
+MODULE_DESCRIPTION("ARC4 Cipher Algorithm");
 MODULE_LICENSE("GPL");
 
 int cifs_arc4_setkey(struct arc4_ctx *ctx, const u8 *in_key, unsigned int key_len)
diff --git a/fs/smb/common/cifs_md4.c b/fs/smb/common/cifs_md4.c
index 50f78cfc6ce9..7ee7f4dad90c 100644
--- a/fs/smb/common/cifs_md4.c
+++ b/fs/smb/common/cifs_md4.c
@@ -24,6 +24,7 @@ 
 #include <asm/byteorder.h>
 #include "md4.h"
 
+MODULE_DESCRIPTION("MD4 Message Digest Algorithm (RFC1320)");
 MODULE_LICENSE("GPL");
 
 static inline u32 lshift(u32 x, unsigned int s)