| Message ID | c5563eeea36aae7bd72ea2e985bc610d585ece40.1604128639.git.yepeilin.cs@gmail.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [1/2] console: Remove dummy con_font_op() callback implementations | expand |
On Sat, Oct 31, 2020 at 03:24:41AM -0400, Peilin Ye wrote: > `struct console_font` is a UAPI structure, thus ideally should not be > used for kernel internal abstraction. Remove some dummy .con_font_set, > .con_font_default and .con_font_copy `struct consw` callback > implementations, to make it cleaner. > > Patch "fbcon: Prevent global-out-of-bounds read in fbcon_copy_font()" > depends on this patch, so Cc: stable. > > Cc: stable@vger.kernel.org > Suggested-by: Daniel Vetter <daniel@ffwll.ch> > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> > --- > Context: https://lore.kernel.org/lkml/CAKMK7uFY2zv0adjKJ_ORVFT7Zzwn075MaU0rEU7_FuqENLR=UA@mail.gmail.com/ > > drivers/usb/misc/sisusbvga/sisusb_con.c | 21 --------------------- > drivers/video/console/dummycon.c | 20 -------------------- > 2 files changed, 41 deletions(-) Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
On Fri, Nov 06, 2020 at 11:50:58AM +0100, Greg Kroah-Hartman wrote: > On Sat, Oct 31, 2020 at 03:24:41AM -0400, Peilin Ye wrote: > > `struct console_font` is a UAPI structure, thus ideally should not be > > used for kernel internal abstraction. Remove some dummy .con_font_set, > > .con_font_default and .con_font_copy `struct consw` callback > > implementations, to make it cleaner. > > > > Patch "fbcon: Prevent global-out-of-bounds read in fbcon_copy_font()" > > depends on this patch, so Cc: stable. > > > > Cc: stable@vger.kernel.org > > Suggested-by: Daniel Vetter <daniel@ffwll.ch> > > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> > > --- > > Context: https://lore.kernel.org/lkml/CAKMK7uFY2zv0adjKJ_ORVFT7Zzwn075MaU0rEU7_FuqENLR=UA@mail.gmail.com/ > > > > drivers/usb/misc/sisusbvga/sisusb_con.c | 21 --------------------- > > drivers/video/console/dummycon.c | 20 -------------------- > > 2 files changed, 41 deletions(-) > > Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Peilin, can you pls resend this together with all the other pending patches from you? I think that's better than me trying to cherry-pick the bits we decided to keep from random places. Greg, ok if I just pull these in through drm-misc-next? It's a pretty bad hairball anyway and that avoids the tree coordination issues. Only thing that might get in the way is the vt font_copy removal, but that's in -rc3 so easy to backmerge. -Daniel
On Tue, Nov 10, 2020 at 01:49:46PM +0100, Daniel Vetter wrote: > Peilin, can you pls resend this together with all the other pending > patches from you? I think that's better than me trying to cherry-pick the > bits we decided to keep from random places. Oh, are we doing an -rc3 backmerge soon? At the moment I can base these patches on neither drm-misc (due to the font_copy removal), nor mainline (due to the signedness issue in font_desc we've talked about), so I'm waiting for a backmerge to rebase everything properly. Sorry that I didn't mention earlier. > Greg, ok if I just pull these in through drm-misc-next? It's a pretty bad > hairball anyway and that avoids the tree coordination issues. Only thing > that might get in the way is the vt font_copy removal, but that's in -rc3 > so easy to backmerge. I will rebase and send everything (including the font_copy garbage-collecting) in a v3 series after the backmerge. Thanks, Peilin Ye
On Tue, Nov 10, 2020 at 2:24 PM Peilin Ye <yepeilin.cs@gmail.com> wrote: > > On Tue, Nov 10, 2020 at 01:49:46PM +0100, Daniel Vetter wrote: > > Peilin, can you pls resend this together with all the other pending > > patches from you? I think that's better than me trying to cherry-pick the > > bits we decided to keep from random places. > > Oh, are we doing an -rc3 backmerge soon? At the moment I can base these > patches on neither drm-misc (due to the font_copy removal), nor mainline > (due to the signedness issue in font_desc we've talked about), so I'm > waiting for a backmerge to rebase everything properly. Sorry that I > didn't mention earlier. linux-next has all the trees, so you can always use that. And yes I'm pushing the backmerge through, so in a few days at most I can pull in all your patches. Meanwhile you can base your work of linux-next. > > Greg, ok if I just pull these in through drm-misc-next? It's a pretty bad > > hairball anyway and that avoids the tree coordination issues. Only thing > > that might get in the way is the vt font_copy removal, but that's in -rc3 > > so easy to backmerge. > > I will rebase and send everything (including the font_copy > garbage-collecting) in a v3 series after the backmerge. Thanks, No need to be blocked on a backmerge, this is only needed for merging the patches. Development should not be blocked like this. -Daniel > > Peilin Ye >
On Tue, Nov 10, 2020 at 02:46:20PM +0100, Daniel Vetter wrote: > On Tue, Nov 10, 2020 at 2:24 PM Peilin Ye <yepeilin.cs@gmail.com> wrote: > > Oh, are we doing an -rc3 backmerge soon? At the moment I can base these > > patches on neither drm-misc (due to the font_copy removal), nor mainline > > (due to the signedness issue in font_desc we've talked about), so I'm > > waiting for a backmerge to rebase everything properly. Sorry that I > > didn't mention earlier. > > linux-next has all the trees, so you can always use that. And yes I'm > pushing the backmerge through, so in a few days at most I can pull in > all your patches. Meanwhile you can base your work of linux-next. > > > > Greg, ok if I just pull these in through drm-misc-next? It's a pretty bad > > > hairball anyway and that avoids the tree coordination issues. Only thing > > > that might get in the way is the vt font_copy removal, but that's in -rc3 > > > so easy to backmerge. > > > > I will rebase and send everything (including the font_copy > > garbage-collecting) in a v3 series after the backmerge. Thanks, > > No need to be blocked on a backmerge, this is only needed for merging > the patches. Development should not be blocked like this. I see. Thanks! Peilin Ye
On Tue, Nov 10, 2020 at 01:49:46PM +0100, Daniel Vetter wrote: > On Fri, Nov 06, 2020 at 11:50:58AM +0100, Greg Kroah-Hartman wrote: > > On Sat, Oct 31, 2020 at 03:24:41AM -0400, Peilin Ye wrote: > > > `struct console_font` is a UAPI structure, thus ideally should not be > > > used for kernel internal abstraction. Remove some dummy .con_font_set, > > > .con_font_default and .con_font_copy `struct consw` callback > > > implementations, to make it cleaner. > > > > > > Patch "fbcon: Prevent global-out-of-bounds read in fbcon_copy_font()" > > > depends on this patch, so Cc: stable. > > > > > > Cc: stable@vger.kernel.org > > > Suggested-by: Daniel Vetter <daniel@ffwll.ch> > > > Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> > > > --- > > > Context: https://lore.kernel.org/lkml/CAKMK7uFY2zv0adjKJ_ORVFT7Zzwn075MaU0rEU7_FuqENLR=UA@mail.gmail.com/ > > > > > > drivers/usb/misc/sisusbvga/sisusb_con.c | 21 --------------------- > > > drivers/video/console/dummycon.c | 20 -------------------- > > > 2 files changed, 41 deletions(-) > > > > Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Peilin, can you pls resend this together with all the other pending > patches from you? I think that's better than me trying to cherry-pick the > bits we decided to keep from random places. > > Greg, ok if I just pull these in through drm-misc-next? It's a pretty bad > hairball anyway and that avoids the tree coordination issues. Only thing > that might get in the way is the vt font_copy removal, but that's in -rc3 > so easy to backmerge. Yes please take them all! thanks, greg k-h
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c index c63e545fb105..dfa0d5ce6012 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_con.c +++ b/drivers/usb/misc/sisusbvga/sisusb_con.c @@ -1345,24 +1345,6 @@ static int sisusbdummycon_blank(struct vc_data *vc, int blank, int mode_switch) return 0; } -static int sisusbdummycon_font_set(struct vc_data *vc, - struct console_font *font, - unsigned int flags) -{ - return 0; -} - -static int sisusbdummycon_font_default(struct vc_data *vc, - struct console_font *font, char *name) -{ - return 0; -} - -static int sisusbdummycon_font_copy(struct vc_data *vc, int con) -{ - return 0; -} - static const struct consw sisusb_dummy_con = { .owner = THIS_MODULE, .con_startup = sisusbdummycon_startup, @@ -1375,9 +1357,6 @@ static const struct consw sisusb_dummy_con = { .con_scroll = sisusbdummycon_scroll, .con_switch = sisusbdummycon_switch, .con_blank = sisusbdummycon_blank, - .con_font_set = sisusbdummycon_font_set, - .con_font_default = sisusbdummycon_font_default, - .con_font_copy = sisusbdummycon_font_copy, }; int diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c index 2a0d0bda7faa..f1711b2f9ff0 100644 --- a/drivers/video/console/dummycon.c +++ b/drivers/video/console/dummycon.c @@ -124,23 +124,6 @@ static int dummycon_switch(struct vc_data *vc) return 0; } -static int dummycon_font_set(struct vc_data *vc, struct console_font *font, - unsigned int flags) -{ - return 0; -} - -static int dummycon_font_default(struct vc_data *vc, - struct console_font *font, char *name) -{ - return 0; -} - -static int dummycon_font_copy(struct vc_data *vc, int con) -{ - return 0; -} - /* * The console `switch' structure for the dummy console * @@ -159,8 +142,5 @@ const struct consw dummy_con = { .con_scroll = dummycon_scroll, .con_switch = dummycon_switch, .con_blank = dummycon_blank, - .con_font_set = dummycon_font_set, - .con_font_default = dummycon_font_default, - .con_font_copy = dummycon_font_copy, }; EXPORT_SYMBOL_GPL(dummy_con);
`struct console_font` is a UAPI structure, thus ideally should not be used for kernel internal abstraction. Remove some dummy .con_font_set, .con_font_default and .con_font_copy `struct consw` callback implementations, to make it cleaner. Patch "fbcon: Prevent global-out-of-bounds read in fbcon_copy_font()" depends on this patch, so Cc: stable. Cc: stable@vger.kernel.org Suggested-by: Daniel Vetter <daniel@ffwll.ch> Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com> --- Context: https://lore.kernel.org/lkml/CAKMK7uFY2zv0adjKJ_ORVFT7Zzwn075MaU0rEU7_FuqENLR=UA@mail.gmail.com/ drivers/usb/misc/sisusbvga/sisusb_con.c | 21 --------------------- drivers/video/console/dummycon.c | 20 -------------------- 2 files changed, 41 deletions(-)